summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2017-08-08 23:22:24 +0200
committerDaiderd Jordan <daiderd@gmail.com>2017-08-08 23:22:24 +0200
commit2adf36ab8c7903e100e6e7a0a6447934ec09b10e (patch)
tree36fcb767ee266594d8347f49fe500f3309c650c7 /pkgs/development/compilers
parenteeeead21c5253e2fea5c8c84da79687cd3abe2fd (diff)
downloadnixpkgs-2adf36ab8c7903e100e6e7a0a6447934ec09b10e.tar
nixpkgs-2adf36ab8c7903e100e6e7a0a6447934ec09b10e.tar.gz
nixpkgs-2adf36ab8c7903e100e6e7a0a6447934ec09b10e.tar.bz2
nixpkgs-2adf36ab8c7903e100e6e7a0a6447934ec09b10e.tar.lz
nixpkgs-2adf36ab8c7903e100e6e7a0a6447934ec09b10e.tar.xz
nixpkgs-2adf36ab8c7903e100e6e7a0a6447934ec09b10e.tar.zst
nixpkgs-2adf36ab8c7903e100e6e7a0a6447934ec09b10e.zip
gcc: fix clang build
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/gcc/5/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index e95ef92c3f6..c9780077835 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -325,7 +325,13 @@ stdenv.mkDerivation ({
 
   NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
-  preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
+  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) ''
     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"