diff options
| -rw-r--r-- | pkgs/development/libraries/crypto++/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index f1c5db1caf1..a609e43b775 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -24,6 +24,17 @@ stdenv.mkDerivation rec { sourceRoot="$PWD/${name}" ''; + cxxflags = if stdenv.isi686 then "-march=i686" else + if stdenv.isx86_64 then "-march=nocona" else + ""; + + configurePhase = '' + sed -i GNUmakefile \ + -e 's|-march=native|${cxxflags}|g' \ + -e 's|-mtune=native||g' \ + -e '/^CXXFLAGS =/s|-g -O2|-O3|' + ''; + # Deal with one of the crappiest build system around there. buildPhase = '' # These guys forgot a file or something. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 342b38b2aa8..1b3a12ffedc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3761,7 +3761,6 @@ let }; cryptopp = import ../development/libraries/crypto++ { - # SIDE-EFFECT WARNING: crypto++-5.6.0 is compiled with "-O2 -march=native -mtune=native". inherit fetchurl stdenv unzip libtool; }; |