Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gcc: revert "kludge to prevent mass-rebuild" from #238154 #243194

Merged
merged 1 commit into from Jul 14, 2023
Merged

gcc: revert "kludge to prevent mass-rebuild" from #238154 #243194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions pkgs/development/compilers/gcc/10/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { })
Expand Down
5 changes: 1 addition & 4 deletions pkgs/development/compilers/gcc/11/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { })
Expand Down
5 changes: 1 addition & 4 deletions pkgs/development/compilers/gcc/12/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 1 addition & 4 deletions pkgs/development/compilers/gcc/13/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 1 addition & 4 deletions pkgs/development/compilers/gcc/4.8/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { })
Expand Down
5 changes: 1 addition & 4 deletions pkgs/development/compilers/gcc/4.9/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { })
Expand Down
5 changes: 1 addition & 4 deletions pkgs/development/compilers/gcc/6/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { })
Expand Down
5 changes: 1 addition & 4 deletions pkgs/development/compilers/gcc/7/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { })
Expand Down
5 changes: 1 addition & 4 deletions pkgs/development/compilers/gcc/8/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { })
Expand Down
5 changes: 1 addition & 4 deletions pkgs/development/compilers/gcc/9/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { })
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/compilers/gcc/builder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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+=(
Expand Down Expand Up @@ -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
Expand Down