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

gccStdenv: actually force gcc if not already used

Browse Source 
Previously the `cc` of the stdenv wasn't changed if `!stdenv.cc.isGNU`
which meant that gccStdenv didn't actually use gcc -- in contrast to all
the versioned `gcc*Stdenv`s.
This commit is contained in:
sternenseemann 2021-05-17 23:46:07 +02:00
parent c958743492
commit b863a7c8c2
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/top-level/all-packages.nix
View File

@ -10402,12 +10402,16 @@ in
}; };
}) else ccWrapper; }) else ccWrapper;
gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { gccStdenv =
allowedRequisites = null; if stdenv.cc.isGNU
# Remove libcxx/libcxxabi, and add clang for AS if on darwin (it uses then stdenv
# clang's internal assembler). else stdenv.override {
extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc; cc = buildPackages.gcc;
}; allowedRequisites = null;
# Remove libcxx/libcxxabi, and add clang for AS if on darwin (it uses
# clang's internal assembler).
extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc;
};
gcc49Stdenv = overrideCC gccStdenv buildPackages.gcc49; gcc49Stdenv = overrideCC gccStdenv buildPackages.gcc49;
gcc6Stdenv = overrideCC gccStdenv buildPackages.gcc6; gcc6Stdenv = overrideCC gccStdenv buildPackages.gcc6;