From 5ad79dc4bb22326e5a98db7bf2b69a76a2e6f01e Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 21 Apr 2019 17:06:50 +0000
Subject: compilation for particular x86_64 architecture

---
 pkgs/tools/archivers/zpaq/default.nix | 5 +----
 pkgs/tools/archivers/zpaq/zpaqd.nix   | 4 +---
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'pkgs/tools/archivers')

diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index 309604999ba..48b3a91b971 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -19,10 +19,7 @@ stdenv.mkDerivation rec {
     CPPFLAGS = with stdenv; ""
       + (lib.optionalString (!isi686 && !isx86_64) "-DNOJIT ")
       + "-Dunix";
-    CXXFLAGS = with stdenv; ""
-      + (lib.optionalString isi686   "-march=i686   -mtune=generic ")
-      + (lib.optionalString isx86_64 "-march=nocona -mtune=generic ")
-      + "-O3 -DNDEBUG";
+    CXXFLAGS = "-O3 -DNDEBUG";
   in ''
     buildFlagsArray=( "CPPFLAGS=${CPPFLAGS}" "CXXFLAGS=${CXXFLAGS}" )
   '';
diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix
index 344f0889090..611654331c3 100644
--- a/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/pkgs/tools/archivers/zpaq/zpaqd.nix
@@ -11,10 +11,8 @@ let
     sha256="0868lynb45lm79yvx5f10lj5h6bfv0yck8whcls2j080vmk3n7rk";
   };
 
-  compileFlags = stdenv.lib.concatStringsSep " " ([ "-O3" "-mtune=generic" "-DNDEBUG" ]
+  compileFlags = stdenv.lib.concatStringsSep " " ([ "-O3" "-DNDEBUG" ]
     ++ stdenv.lib.optional (stdenv.hostPlatform.isUnix) "-Dunix -pthread"
-    ++ stdenv.lib.optional (stdenv.hostPlatform.isi686) "-march=i686"
-    ++ stdenv.lib.optional (stdenv.hostPlatform.isx86_64) "-march=nocona"
     ++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "-DNOJIT");
 in
 stdenv.mkDerivation {
-- 
cgit 1.4.1