diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-01 17:13:58 -0500 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-07 01:42:43 -0500 |
commit | 51948eab9415fde1825dea5c7d31b99b2e1a0fdb (patch) | |
tree | d63f4f48df3f91e4f0cb4b7b61d439ddc6adc732 /pkgs/development/compilers/gcc/7 | |
parent | 974b9201a5d87c576816342dfbe4abb5dc1c7405 (diff) | |
download | nixlib-51948eab9415fde1825dea5c7d31b99b2e1a0fdb.tar nixlib-51948eab9415fde1825dea5c7d31b99b2e1a0fdb.tar.gz nixlib-51948eab9415fde1825dea5c7d31b99b2e1a0fdb.tar.bz2 nixlib-51948eab9415fde1825dea5c7d31b99b2e1a0fdb.tar.lz nixlib-51948eab9415fde1825dea5c7d31b99b2e1a0fdb.tar.xz nixlib-51948eab9415fde1825dea5c7d31b99b2e1a0fdb.tar.zst nixlib-51948eab9415fde1825dea5c7d31b99b2e1a0fdb.zip |
gcc: Fix after merge
- NIX_CC_CROSS is now completely gone! - NIX_CC is defined reliably, so no manual def needed - stdenv.ccCross -> stdenv.cc, also removing need for "or" fallback
Diffstat (limited to 'pkgs/development/compilers/gcc/7')
-rw-r--r-- | pkgs/development/compilers/gcc/7/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index c8d54308c955..d70214e41143 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -36,6 +36,7 @@ , darwin ? null , flex ? null , buildPlatform, hostPlatform, targetPlatform +, buildPackages }: assert langJava -> zip != null && unzip != null @@ -343,7 +344,7 @@ stdenv.mkDerivation ({ ) } ${optionalString (!(crossMingw && crossStageStatic)) - "--with-native-system-header-dir=${getDev (stdenv.ccCross or stdenv.cc).libc}/include"} + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include"} ${if langAda then " --enable-libada" else ""} ${if targetPlatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""} ${if targetPlatform != hostPlatform then crossConfigureFlags else ""} @@ -408,8 +409,7 @@ stdenv.mkDerivation ({ buildFlags = ""; }; - NIX_BUILD_CC = stdenv.cc; - NIX_CC_CROSS = stdenv.ccCross or null; + NIX_BUILD_CC = buildPackages.stdenv.cc; # Needed for the cross compilation to work AR = "ar"; |