gccStdenv: actually force gcc if not already used
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:
parent
c958743492
commit
b863a7c8c2
|
@ -10402,12 +10402,16 @@ in
|
|||
};
|
||||
}) else ccWrapper;
|
||||
|
||||
gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override {
|
||||
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;
|
||||
};
|
||||
gccStdenv =
|
||||
if stdenv.cc.isGNU
|
||||
then stdenv
|
||||
else stdenv.override {
|
||||
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;
|
||||
gcc6Stdenv = overrideCC gccStdenv buildPackages.gcc6;
|
||||
|
|
Loading…
Reference in a new issue