Merge pull request #332112 from philiptaron/issue-61130/by-name

{gfortran{,48,49},gfortran{6..14}}: move to by-name
This commit is contained in:
Philip Taron
2024-08-04 20:02:08 -07:00
committed by GitHub
13 changed files with 121 additions and 97 deletions

View File

@@ -0,0 +1,11 @@
{ wrapCC, gcc }:
# Use the same GCC version as the one from stdenv by default
wrapCC (
gcc.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
}
)

View File

@@ -0,0 +1,10 @@
{ wrapCC, gcc10 }:
wrapCC (
gcc10.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
}
)

View File

@@ -0,0 +1,10 @@
{ wrapCC, gcc11 }:
wrapCC (
gcc11.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
}
)

View File

@@ -0,0 +1,10 @@
{ wrapCC, gcc12 }:
wrapCC (
gcc12.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
}
)

View File

@@ -0,0 +1,10 @@
{ wrapCC, gcc13 }:
wrapCC (
gcc13.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
}
)

View File

@@ -0,0 +1,10 @@
{ wrapCC, gcc14 }:
wrapCC (
gcc14.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
}
)

View File

@@ -0,0 +1,10 @@
{ wrapCC, gcc48 }:
wrapCC (
gcc48.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
}
)

View File

@@ -0,0 +1,10 @@
{ wrapCC, gcc49 }:
wrapCC (
gcc49.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
}
)

View File

@@ -0,0 +1,10 @@
{ wrapCC, gcc6 }:
wrapCC (
gcc6.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
}
)

View File

@@ -0,0 +1,10 @@
{ wrapCC, gcc7 }:
wrapCC (
gcc7.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
}
)

View File

@@ -0,0 +1,10 @@
{ wrapCC, gcc8 }:
wrapCC (
gcc8.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
}
)

View File

@@ -0,0 +1,10 @@
{ wrapCC, gcc9 }:
wrapCC (
gcc9.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
}
)

View File

@@ -15204,103 +15204,6 @@ with pkgs;
gcc_latest = gcc14;
# Use the same GCC version as the one from stdenv by default
gfortran = wrapCC (gcc.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
});
gfortran48 = wrapCC (gcc48.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
});
gfortran49 = wrapCC (gcc49.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
});
gfortran6 = wrapCC (gcc6.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
});
gfortran7 = wrapCC (gcc7.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
});
gfortran8 = wrapCC (gcc8.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
});
gfortran9 = wrapCC (gcc9.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
});
gfortran10 = wrapCC (gcc10.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
});
gfortran11 = wrapCC (gcc11.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
});
gfortran12 = wrapCC (gcc12.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
});
gfortran13 = wrapCC (gcc13.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
});
gfortran14 = wrapCC (gcc14.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
});
libgccjit = gcc.cc.override {
name = "libgccjit";
langFortran = false;