gcc-*: Clean up crossStageStatic logic

54282b9610 tread carefuly to avoid a mass
rebuild. This embraces the mass rebuild to clean things up.

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,
+  inherit noSysDirs staticCompiler langJava crossStageStatic
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler langJava
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

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,
+  inherit noSysDirs staticCompiler langJava crossStageStatic
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler langJava
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

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,
+  inherit noSysDirs staticCompiler langJava crossStageStatic
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler langJava
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

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,
+  inherit noSysDirs staticCompiler langJava crossStageStatic
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler langJava
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

pkgs/development/compilers/gcc/7/default.nix

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

pkgs/development/compilers/gcc/8/default.nix

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

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+=(

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,
+  inherit noSysDirs staticCompiler crossStageStatic
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];