diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-11 09:57:31 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-11 09:59:39 +0200 |
| commit | ab450c0909411be75adb671bc892987e608f16b7 (patch) | |
| tree | 736afa233cfda37d2358014522c1ee1878655465 /pkgs/development/compilers | |
| parent | a06a405d0bf57699a8fb9976c6acae08641852cc (diff) | |
| download | nixlib-ab450c0909411be75adb671bc892987e608f16b7.tar nixlib-ab450c0909411be75adb671bc892987e608f16b7.tar.gz nixlib-ab450c0909411be75adb671bc892987e608f16b7.tar.bz2 nixlib-ab450c0909411be75adb671bc892987e608f16b7.tar.lz nixlib-ab450c0909411be75adb671bc892987e608f16b7.tar.xz nixlib-ab450c0909411be75adb671bc892987e608f16b7.tar.zst nixlib-ab450c0909411be75adb671bc892987e608f16b7.zip | |
gcc: fixup the tarball job after merging #15867
The evaluation problem happened in while checking find-tarballs.nix http://hydra.nixos.org/build/36754203/nixlog/1/raw (it didn't seem worth digging into why exactly)
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index a73d1fd7c9e3..9ab725e2da88 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -166,8 +166,8 @@ let version = "5.4.0"; " --disable-libatomic " + # libatomic requires libc " --disable-decimal-float" # libdecnumber requires libc else - (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot" - else " --with-headers=${libcCross.dev}/include") + + (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot" + else " --with-headers=${getDev libcCross}/include") + # Ensure that -print-prog-name is able to find the correct programs. (stdenv.lib.optionalString (crossMingw || crossDarwin) ( " --with-as=${binutilsCross}/bin/${cross.config}-as" + @@ -485,7 +485,7 @@ stdenv.mkDerivation ({ EXTRA_TARGET_CFLAGS = if cross != null && libcCross != null then [ - "-idirafter ${libcCross.dev}/include" + "-idirafter ${getDev libcCross}/include" ] ++ optionals (! crossStageStatic) [ "-B${libcCross.out}/lib" |