gcc: kludge to prevent mass-rebuild
This commit is reverted in #240596 (which must go to staging).
This commit is contained in:
parent
63305d00d3
commit
96a2f1b4e1
|
@ -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 { })
|
||||
|
|
|
@ -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 { })
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 { })
|
||||
|
|
|
@ -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 { })
|
||||
|
|
|
@ -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 { })
|
||||
|
|
|
@ -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 { })
|
||||
|
|
|
@ -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 { })
|
||||
|
|
|
@ -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 { })
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue