diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-20 15:02:21 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-21 15:49:18 -0400 |
| commit | 54282b9610e80b1ed93136319e24cb79c5bbcc33 (patch) | |
| tree | 45b7ce974aa318ac1d6953ad16f6ea2606dd570c /pkgs/development/compilers/gcc/4.5/default.nix | |
| parent | 3af3d6efc23400613ef9301dfa67220b9e8ff647 (diff) | |
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.5/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.5/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index bec2aab017ea3..5bad03d302528 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -20,7 +20,7 @@ , enableMultilib ? false , name ? "gcc" , libcCross ? null -, crossStageStatic ? true +, crossStageStatic ? false , gnat ? null , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , stripped ? true @@ -213,7 +213,9 @@ stdenv.mkDerivation ({ '' else null; - inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic + # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, + crossStageStatic = targetPlatform == hostPlatform || crossStageStatic; + inherit noSysDirs profiledCompiler staticCompiler langJava libcCross crossMingw; nativeBuildInputs = [ texinfo which gettext ] |