Merge pull request #46127 from obsidiansystems/gcc-crossStageStatic-cleanup

gcc-*: Clean up crossStageStatic logic
2018-09-25 00:01:28 -04:00
parent da18634eff d68a9d9db9
commit b1d518206a
8 changed files with 8 additions and 22 deletions
@@ -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 ];