diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-08-15 18:57:42 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-08-16 21:38:41 +0200 |
| commit | 6e245440d427a3ad08c73a037ba2f7706b884051 (patch) | |
| tree | 0c146ac5ed6925f9274bcd86a34edd6b05dd395a /pkgs/development/compilers | |
| parent | 8932357e04d0bc432a7ea9524efc66dcb8b964ab (diff) | |
| download | nixpkgs-6e245440d427a3ad08c73a037ba2f7706b884051.tar nixpkgs-6e245440d427a3ad08c73a037ba2f7706b884051.tar.gz nixpkgs-6e245440d427a3ad08c73a037ba2f7706b884051.tar.bz2 nixpkgs-6e245440d427a3ad08c73a037ba2f7706b884051.tar.lz nixpkgs-6e245440d427a3ad08c73a037ba2f7706b884051.tar.xz nixpkgs-6e245440d427a3ad08c73a037ba2f7706b884051.tar.zst nixpkgs-6e245440d427a3ad08c73a037ba2f7706b884051.zip | |
gcc: remove CPP workaround
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index c9780077835..e95ef92c3f6 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -325,13 +325,7 @@ stdenv.mkDerivation ({ NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; - preConfigure = - # Not sure why this is causing problems, now that the stdenv - # exports CPP=cpp the build fails with strange errors on darwin. - # https://github.com/NixOS/nixpkgs/issues/27889 - stdenv.lib.optionalString stdenv.cc.isClang '' - unset CPP - '' + stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' + preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" |