Merge pull request #123421 from sternenseemann/gcc-stdenv-force-gcc
gccStdenv: actually force gcc if not already used
This commit is contained in:
commit
275b41e4d6
|
@ -10410,12 +10410,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;
|
||||||
|
|
Loading…
Reference in a new issue