From 94571e51c4b798f5a60335fbff86e966b7347af9 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Fri, 2 Sep 2016 04:34:11 -0700 Subject: zpaq: only set -mtune on i686,x86_64 (#18214) --- pkgs/tools/archivers/zpaq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/archivers/zpaq') diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 832f8a4f8c56..44f318a0cc6f 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { + (lib.optionalString (!isi686 && !isx86_64) "-DNOJIT ") + "-Dunix"; CXXFLAGS = with stdenv; "" - + (lib.optionalString (isi686) "-march=i686 ") - + (lib.optionalString (isx86_64) "-march=nocona ") - + "-O3 -mtune=generic -DNDEBUG"; + + (lib.optionalString isi686 "-march=i686 -mtune=generic ") + + (lib.optionalString isx86_64 "-march=nocona -mtune=generic ") + + "-O3 -DNDEBUG"; in '' buildFlagsArray=( "CPPFLAGS=${CPPFLAGS}" "CXXFLAGS=${CXXFLAGS}" ) ''; -- cgit 1.4.1