b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #123421 from sternenseemann/gcc-stdenv-force-gcc

Browse source 
gccStdenv: actually force gcc if not already used
This commit is contained in:
John Ericson 2021-05-17 21:55:09 -07:00 committed by GitHub
parent fc2e0709f0 b863a7c8c2
commit 275b41e4d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -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;