From b14db1b0baea19934313ee90b56b157315ab328b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 5 Sep 2018 14:28:04 -0400 Subject: [PATCH] gcc-*: Clean up crossStageStatic logic 54282b9610e80b1ed93136319e24cb79c5bbcc33 tread carefuly to avoid a mass rebuild. This embraces the mass rebuild to clean things up. --- pkgs/development/compilers/gcc/4.8/default.nix | 4 +--- pkgs/development/compilers/gcc/4.9/default.nix | 4 +--- pkgs/development/compilers/gcc/5/default.nix | 4 +--- pkgs/development/compilers/gcc/6/default.nix | 4 +--- pkgs/development/compilers/gcc/7/default.nix | 4 +--- pkgs/development/compilers/gcc/8/default.nix | 4 +--- pkgs/development/compilers/gcc/builder.sh | 2 +- pkgs/development/compilers/gcc/snapshot/default.nix | 4 +--- 8 files changed, 8 insertions(+), 22 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 60db368c403a..d9376f597a70 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -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 ]; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 361db92cb767..c60f54f1560c 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -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 ]; diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 2e51e9c05066..efd6ec072573 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -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 ]; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index e6825afcfa84..4760d18a7d81 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -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 ]; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 4dfbcf0f5458..bb8a3638b2db 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -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 ]; diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 04054df8bf82..59d7653c52cd 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -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 ]; diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index a3250f4021a5..75e70006d749 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -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+=( diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 230409e97538..0de6be36c351 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -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 ];