Merge pull request #298156 from trofi/pin-to-gcc12-if-gcc13-drop
pin-to-gcc12-if-gcc13: drop as it's not used anymore
This commit is contained in:
commit
f3e065481d
1 changed files with 0 additions and 8 deletions
|
@ -15673,14 +15673,6 @@ with pkgs;
|
||||||
gccFun = callPackage ../development/compilers/gcc;
|
gccFun = callPackage ../development/compilers/gcc;
|
||||||
gcc-unwrapped = gcc.cc;
|
gcc-unwrapped = gcc.cc;
|
||||||
|
|
||||||
pin-to-gcc12-if-gcc13 = pkg:
|
|
||||||
if !(lib.isDerivation pkg) || !(pkg?override) then pkg else
|
|
||||||
pkg.override (previousArgs:
|
|
||||||
lib.optionalAttrs (previousArgs.stdenv.cc.cc.isGNU or false &&
|
|
||||||
lib.versionAtLeast previousArgs.stdenv.cc.cc.version "13.0") {
|
|
||||||
stdenv = gcc12Stdenv;
|
|
||||||
});
|
|
||||||
|
|
||||||
wrapNonDeterministicGcc = stdenv: ccWrapper:
|
wrapNonDeterministicGcc = stdenv: ccWrapper:
|
||||||
if ccWrapper.isGNU then ccWrapper.overrideAttrs(old: {
|
if ccWrapper.isGNU then ccWrapper.overrideAttrs(old: {
|
||||||
env = old.env // {
|
env = old.env // {
|
||||||
|
|
Loading…
Reference in a new issue