diff options
author | Adam Joseph <adam@westernsemico.com> | 2023-06-16 14:52:41 -0700 |
---|---|---|
committer | Adam Joseph <adam@westernsemico.com> | 2023-07-01 13:12:41 -0700 |
commit | 96a2f1b4e1315251f1916f64c4632dbf7eb40522 (patch) | |
tree | 9c19be653c11ae87190446bb8c687bd5060c40d2 | |
parent | 63305d00d32e8c743e36155a7d8cd544dc676d5b (diff) | |
download | nixpkgs-96a2f1b4e1315251f1916f64c4632dbf7eb40522.tar nixpkgs-96a2f1b4e1315251f1916f64c4632dbf7eb40522.tar.gz nixpkgs-96a2f1b4e1315251f1916f64c4632dbf7eb40522.tar.bz2 nixpkgs-96a2f1b4e1315251f1916f64c4632dbf7eb40522.tar.lz nixpkgs-96a2f1b4e1315251f1916f64c4632dbf7eb40522.tar.xz nixpkgs-96a2f1b4e1315251f1916f64c4632dbf7eb40522.tar.zst nixpkgs-96a2f1b4e1315251f1916f64c4632dbf7eb40522.zip |
gcc: kludge to prevent mass-rebuild
This commit is reverted in #240596 (which must go to staging).
-rw-r--r-- | pkgs/development/compilers/gcc/10/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/11/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/12/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/13/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/4.9/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/7/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/8/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/9/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/builder.sh | 4 |
11 files changed, 42 insertions, 12 deletions
diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index c61093c67c0..739b6d2e2c1 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -214,7 +214,10 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - inherit noSysDirs staticCompiler withoutTargetLibc + # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging + crossStageStatic = withoutTargetLibc; + + inherit noSysDirs staticCompiler libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index f61e51e2cab..ca4540b8c71 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -227,7 +227,10 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - inherit noSysDirs staticCompiler withoutTargetLibc + # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging + crossStageStatic = withoutTargetLibc; + + inherit noSysDirs staticCompiler libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 9665c2a9fe8..ebc1796ec38 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -271,7 +271,10 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - inherit noSysDirs staticCompiler withoutTargetLibc + # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging + crossStageStatic = withoutTargetLibc; + + inherit noSysDirs staticCompiler libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; diff --git a/pkgs/development/compilers/gcc/13/default.nix b/pkgs/development/compilers/gcc/13/default.nix index 1b73c251ce6..5fb78cfd7b4 100644 --- a/pkgs/development/compilers/gcc/13/default.nix +++ b/pkgs/development/compilers/gcc/13/default.nix @@ -265,7 +265,10 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - inherit noSysDirs staticCompiler withoutTargetLibc + # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging + crossStageStatic = withoutTargetLibc; + + inherit noSysDirs staticCompiler libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index fa856eff96e..3625257efe9 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -232,7 +232,10 @@ lib.pipe (stdenv.mkDerivation ({ '' else null; - inherit noSysDirs staticCompiler langJava withoutTargetLibc + # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging + crossStageStatic = withoutTargetLibc; + + inherit noSysDirs staticCompiler langJava libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index bab79f968db..e433e66b9f6 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -253,7 +253,10 @@ lib.pipe (stdenv.mkDerivation ({ '' else null; - inherit noSysDirs staticCompiler langJava withoutTargetLibc + # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging + crossStageStatic = withoutTargetLibc; + + inherit noSysDirs staticCompiler langJava libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index f443babb4b7..f64963b906c 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -269,7 +269,10 @@ lib.pipe (stdenv.mkDerivation ({ )) ); - inherit noSysDirs staticCompiler langJava withoutTargetLibc + # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging + crossStageStatic = withoutTargetLibc; + + inherit noSysDirs staticCompiler langJava libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 5b6ea7ead50..90785143f05 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -218,7 +218,10 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - inherit noSysDirs staticCompiler withoutTargetLibc + # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging + crossStageStatic = withoutTargetLibc; + + inherit noSysDirs staticCompiler libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index f903e264b0a..29f0a88c955 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -199,7 +199,10 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - inherit noSysDirs staticCompiler withoutTargetLibc + # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging + crossStageStatic = withoutTargetLibc; + + inherit noSysDirs staticCompiler libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 289212a1363..29e4117fc6a 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -213,7 +213,10 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - inherit noSysDirs staticCompiler withoutTargetLibc + # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging + crossStageStatic = withoutTargetLibc; + + inherit noSysDirs staticCompiler libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 892dbb565b8..5147df1e4cc 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -135,7 +135,7 @@ if test "$noSysDirs" = "1"; then ) fi - if test "$withoutTargetLibc" == 1; then + if test "$crossStageStatic" == 1; then # We don't want the gcc build to assume there will be a libc providing # limits.h in this stage makeFlagsArray+=( @@ -167,7 +167,7 @@ preConfigure() { rm -Rf zlib fi - if test -n "$crossMingw" -a -n "$withoutTargetLibc"; then + if test -n "$crossMingw" -a -n "$crossStageStatic"; then mkdir -p ../mingw # --with-build-sysroot expects that: cp -R $libcCross/include ../mingw |