summary refs log tree commit diff
path: root/pkgs/development/compilers/gcc/4.8
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-09-20 15:02:21 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-09-21 15:49:18 -0400
commit54282b9610e80b1ed93136319e24cb79c5bbcc33 (patch)
tree45b7ce974aa318ac1d6953ad16f6ea2606dd570c /pkgs/development/compilers/gcc/4.8
parent3af3d6efc23400613ef9301dfa67220b9e8ff647 (diff)
downloadnixlib-54282b9610e80b1ed93136319e24cb79c5bbcc33.tar
nixlib-54282b9610e80b1ed93136319e24cb79c5bbcc33.tar.gz
nixlib-54282b9610e80b1ed93136319e24cb79c5bbcc33.tar.bz2
nixlib-54282b9610e80b1ed93136319e24cb79c5bbcc33.tar.lz
nixlib-54282b9610e80b1ed93136319e24cb79c5bbcc33.tar.xz
nixlib-54282b9610e80b1ed93136319e24cb79c5bbcc33.tar.zst
nixlib-54282b9610e80b1ed93136319e24cb79c5bbcc33.zip
gcc: Change default of `crossStageStatic` param to false
This gets us one step closer to removing `gccCrossStageFinal`.

Care is taken to avoid a mass rebuild; will clean up with one later.
Diffstat (limited to 'pkgs/development/compilers/gcc/4.8')
-rw-r--r--pkgs/development/compilers/gcc/4.8/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 5b9d368c457b..72e37f18a178 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -26,7 +26,7 @@
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
 , libcCross ? null
-, crossStageStatic ? true
+, crossStageStatic ? false
 , gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
@@ -284,7 +284,9 @@ stdenv.mkDerivation ({
         ''
     else null;
 
-  inherit noSysDirs staticCompiler langJava crossStageStatic
+  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
+  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
+  inherit noSysDirs staticCompiler langJava
     libcCross crossMingw;
 
   nativeBuildInputs = [ texinfo which gettext ]