diff options
author | Adam Joseph <adam@westernsemico.com> | 2023-06-29 10:18:09 -0700 |
---|---|---|
committer | Adam Joseph <adam@westernsemico.com> | 2023-06-30 02:28:13 -0700 |
commit | c04c1a1777586016d8f3bec1d84df6122107d495 (patch) | |
tree | 195d18b440124b0d5284e2071350f9998fc49f1b | |
parent | 72bec397fa2fa9376578be7f830a5422f6f481e1 (diff) |
Revert "gcc: kludge to prevent mass-rebuild"
This reverts commit 8dce1f7383b064ae5adee7702a8eeed06346dd24.
-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, 12 insertions, 42 deletions
diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 739b6d2e2c1de..c61093c67c03a 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -214,10 +214,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler + inherit noSysDirs staticCompiler withoutTargetLibc 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 ca4540b8c7132..f61e51e2cabe3 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -227,10 +227,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler + inherit noSysDirs staticCompiler withoutTargetLibc 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 ebc1796ec3854..9665c2a9fe85b 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -271,10 +271,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler + inherit noSysDirs staticCompiler withoutTargetLibc 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 5fb78cfd7b40c..1b73c251ce6f8 100644 --- a/pkgs/development/compilers/gcc/13/default.nix +++ b/pkgs/development/compilers/gcc/13/default.nix @@ -265,10 +265,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler + inherit noSysDirs staticCompiler withoutTargetLibc 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 3625257efe9a8..fa856eff96e5f 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -232,10 +232,7 @@ lib.pipe (stdenv.mkDerivation ({ '' else null; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler langJava + inherit noSysDirs staticCompiler langJava withoutTargetLibc 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 e433e66b9f690..bab79f968db38 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -253,10 +253,7 @@ lib.pipe (stdenv.mkDerivation ({ '' else null; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler langJava + inherit noSysDirs staticCompiler langJava withoutTargetLibc 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 f64963b906cf7..f443babb4b706 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -269,10 +269,7 @@ lib.pipe (stdenv.mkDerivation ({ )) ); - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler langJava + inherit noSysDirs staticCompiler langJava withoutTargetLibc 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 90785143f05ea..5b6ea7ead50a5 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -218,10 +218,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler + inherit noSysDirs staticCompiler withoutTargetLibc 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 29f0a88c95517..f903e264b0af6 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -199,10 +199,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler + inherit noSysDirs staticCompiler withoutTargetLibc 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 29e4117fc6a70..289212a136356 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -213,10 +213,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - # kludge to prevent a mass-rebuild; will be removed in a PR sent to staging - crossStageStatic = withoutTargetLibc; - - inherit noSysDirs staticCompiler + inherit noSysDirs staticCompiler withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 75ff2a1317a64..d9016c45e5794 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 "$crossStageStatic" == 1; then + if test "$withoutTargetLibc" == 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 "$crossStageStatic"; then + if test -n "$crossMingw" -a -n "$withoutTargetLibc"; then mkdir -p ../mingw # --with-build-sysroot expects that: cp -R $libcCross/include ../mingw |