nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 04:46:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #243194 from amjoseph-nixpkgs/pr/gcc/crossStageStatic-undo-the-hack

Browse Source 
gcc: revert "kludge to prevent mass-rebuild" from #238154
This commit is contained in:
John Ericson 2023-07-13 21:40:51 -04:00 committed by GitHub
commit badbdfd88d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 12 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/gcc/10/default.nix
View File

@ -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 { })

5
pkgs/development/compilers/gcc/11/default.nix
View File

@ -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 { })

5
pkgs/development/compilers/gcc/12/default.nix
View File

@ -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;

5
pkgs/development/compilers/gcc/13/default.nix
View File

@ -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;

5
pkgs/development/compilers/gcc/4.8/default.nix
View File

@ -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 { })

5
pkgs/development/compilers/gcc/4.9/default.nix
View File

@ -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 { })

5
pkgs/development/compilers/gcc/6/default.nix
View File

@ -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 { })

5
pkgs/development/compilers/gcc/7/default.nix
View File

@ -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 { })

5
pkgs/development/compilers/gcc/8/default.nix
View File

@ -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 { })

5
pkgs/development/compilers/gcc/9/default.nix
View File

@ -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 { })

4
pkgs/development/compilers/gcc/builder.sh
View File

@ -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