public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'obsidian/ghcjs-cross-without-cc-common' into ghcjs-cross-without-cc

This commit is contained in:
John Ericson 2019-12-30 18:16:22 -05:00
parent 9cbbe2b00f 6078f094c6
commit c1fb358a78
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/stdenv/booter.nix
View File

@ -126,7 +126,11 @@ stageFuns: let
if buildPackages.stdenv.cc.isClang or false if buildPackages.stdenv.cc.isClang or false
then buildPackages.clang then buildPackages.clang
else buildPackages.gcc else buildPackages.gcc
else buildPackages.stdenv.cc; else
# This will blow up if anything uses it, but that's OK. The `if
# buildPackages.stdenv.cc.isClang then ... else ...` would blow up
# everything, so we make sure to avoid that.
buildPackages.stdenv.cc;
}; };
in dfold folder postStage (_: {}) withAllowCustomOverrides in dfold folder postStage (_: {}) withAllowCustomOverrides