about summary refs log tree commit diff
path: root/pkgs/development/compilers/gcc/8/default.nix
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-09-05 14:28:04 -0400
committerJan Malakhovski <oxij@oxij.org>2018-09-23 17:30:32 +0000
commitb14db1b0baea19934313ee90b56b157315ab328b (patch)
tree43a16046ee324b9a6f48f3f468fe5f083a9e3e26 /pkgs/development/compilers/gcc/8/default.nix
parentb2c7a5a271269175bbcb2907ca821139a7ee465f (diff)
downloadnixlib-b14db1b0baea19934313ee90b56b157315ab328b.tar
nixlib-b14db1b0baea19934313ee90b56b157315ab328b.tar.gz
nixlib-b14db1b0baea19934313ee90b56b157315ab328b.tar.bz2
nixlib-b14db1b0baea19934313ee90b56b157315ab328b.tar.lz
nixlib-b14db1b0baea19934313ee90b56b157315ab328b.tar.xz
nixlib-b14db1b0baea19934313ee90b56b157315ab328b.tar.zst
nixlib-b14db1b0baea19934313ee90b56b157315ab328b.zip
gcc-*: Clean up crossStageStatic logic
54282b9610e80b1ed93136319e24cb79c5bbcc33 tread carefuly to avoid a mass
rebuild. This embraces the mass rebuild to clean things up.
Diffstat (limited to 'pkgs/development/compilers/gcc/8/default.nix')
-rw-r--r--pkgs/development/compilers/gcc/8/default.nix4
1 files changed, 1 insertions, 3 deletions
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 ];