diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-29 14:23:05 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-29 14:23:05 -0500 |
| commit | 2365e2ffcd1ecd95bda8a81fe7de32edc1073b35 (patch) | |
| tree | 6671ba9c8e2a043f79745436beb05f74eec0f564 /pkgs/development/compilers/gcc/4.8 | |
| parent | 771bae04e8ebcef3f11a0be55c28a571181aa231 (diff) | |
| parent | 51948eab9415fde1825dea5c7d31b99b2e1a0fdb (diff) | |
| download | nixlib-2365e2ffcd1ecd95bda8a81fe7de32edc1073b35.tar nixlib-2365e2ffcd1ecd95bda8a81fe7de32edc1073b35.tar.gz nixlib-2365e2ffcd1ecd95bda8a81fe7de32edc1073b35.tar.bz2 nixlib-2365e2ffcd1ecd95bda8a81fe7de32edc1073b35.tar.lz nixlib-2365e2ffcd1ecd95bda8a81fe7de32edc1073b35.tar.xz nixlib-2365e2ffcd1ecd95bda8a81fe7de32edc1073b35.tar.zst nixlib-2365e2ffcd1ecd95bda8a81fe7de32edc1073b35.zip | |
Merge commit '51948eab9415fde1825dea5c7d31b99b2e1a0fdb' into mingw32-w64-fix
Diffstat (limited to 'pkgs/development/compilers/gcc/4.8')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index f7674bb11845..e4d24d6d3ed7 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -33,6 +33,7 @@ , gnused ? null , darwin ? null , buildPlatform, hostPlatform, targetPlatform +, buildPackages }: assert langJava -> zip != null && unzip != null @@ -335,7 +336,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 ""} @@ -400,8 +401,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"; |