JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gcc-*: Clean up crossStageStatic logic

Browse Source 
54282b9610 tread carefuly to avoid a mass
rebuild. This embraces the mass rebuild to clean things up.
This commit is contained in:
John Ericson 2018-09-05 14:28:04 -04:00 committed by Jan Malakhovski
parent b2c7a5a271
commit b14db1b0ba
8 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,9 +201,7 @@ stdenv.mkDerivation ({
''
else null;
# TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
inherit noSysDirs staticCompiler langJava
inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];

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

@ -210,9 +210,7 @@ stdenv.mkDerivation ({
''
else null;
# TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
inherit noSysDirs staticCompiler langJava
inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];

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

@ -215,9 +215,7 @@ stdenv.mkDerivation ({
)
else null;
# TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
inherit noSysDirs staticCompiler langJava
inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];

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

@ -216,9 +216,7 @@ stdenv.mkDerivation ({
)
else null;
# TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
inherit noSysDirs staticCompiler langJava
inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];

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

@ -189,9 +189,7 @@ stdenv.mkDerivation ({
)
else "");
# TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
inherit noSysDirs staticCompiler
inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];

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

@ -184,9 +184,7 @@ stdenv.mkDerivation ({
)
else "");
# TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
inherit noSysDirs staticCompiler
inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];

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

@ -131,7 +131,7 @@ if test "$noSysDirs" = "1"; then
)
fi
if test -n "${targetConfig-}" -a "$crossStageStatic" == 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 stagae
makeFlagsArray+=(

4
pkgs/development/compilers/gcc/snapshot/default.nix
View File

@ -154,9 +154,7 @@ stdenv.mkDerivation ({
''
else null;
# TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
inherit noSysDirs staticCompiler
inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];