public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
John Ericson 2017-09-20 15:02:21 -04:00
parent 3af3d6efc2
commit 54282b9610
8 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/gcc/4.5/default.nix
View File

@ -20,7 +20,7 @@
, enableMultilib ? false , enableMultilib ? false
, name ? "gcc" , name ? "gcc"
, libcCross ? null , libcCross ? null
, crossStageStatic ? true , crossStageStatic ? false
, gnat ? null , gnat ? null
, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd
, stripped ? true , stripped ? true
@ -213,7 +213,9 @@ stdenv.mkDerivation ({
'' ''
else null; 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; libcCross crossMingw;
nativeBuildInputs = [ texinfo which gettext ] nativeBuildInputs = [ texinfo which gettext ]

6
pkgs/development/compilers/gcc/4.8/default.nix
View File

@ -26,7 +26,7 @@
, enablePlugin ? true # whether to support user-supplied plug-ins , enablePlugin ? true # whether to support user-supplied plug-ins
, name ? "gcc" , name ? "gcc"
, libcCross ? null , libcCross ? null
, crossStageStatic ? true , crossStageStatic ? false
, gnat ? null , gnat ? null
, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd
, stripped ? true , stripped ? true
@ -284,7 +284,9 @@ stdenv.mkDerivation ({
'' ''
else null; 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; libcCross crossMingw;
nativeBuildInputs = [ texinfo which gettext ] nativeBuildInputs = [ texinfo which gettext ]

6
pkgs/development/compilers/gcc/4.9/default.nix
View File

@ -26,7 +26,7 @@
, enablePlugin ? true # whether to support user-supplied plug-ins , enablePlugin ? true # whether to support user-supplied plug-ins
, name ? "gcc" , name ? "gcc"
, libcCross ? null , libcCross ? null
, crossStageStatic ? true , crossStageStatic ? false
, gnat ? null , gnat ? null
, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd
, stripped ? true , stripped ? true
@ -280,7 +280,9 @@ stdenv.mkDerivation ({
'' ''
else null; 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; libcCross crossMingw;
nativeBuildInputs = [ texinfo which gettext ] nativeBuildInputs = [ texinfo which gettext ]

6
pkgs/development/compilers/gcc/5/default.nix
View File

@ -26,7 +26,7 @@
, enablePlugin ? true # whether to support user-supplied plug-ins , enablePlugin ? true # whether to support user-supplied plug-ins
, name ? "gcc" , name ? "gcc"
, libcCross ? null , libcCross ? null
, crossStageStatic ? true , crossStageStatic ? false
, gnat ? null , gnat ? null
, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd
, stripped ? true , stripped ? true
@ -299,7 +299,9 @@ stdenv.mkDerivation ({
'' ''
else null; 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; libcCross crossMingw;
nativeBuildInputs = [ texinfo which gettext ] nativeBuildInputs = [ texinfo which gettext ]

6
pkgs/development/compilers/gcc/6/default.nix
View File

@ -26,7 +26,7 @@
, enablePlugin ? true # whether to support user-supplied plug-ins , enablePlugin ? true # whether to support user-supplied plug-ins
, name ? "gcc" , name ? "gcc"
, libcCross ? null , libcCross ? null
, crossStageStatic ? true , crossStageStatic ? false
, gnat ? null , gnat ? null
, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd
, stripped ? true , stripped ? true
@ -292,7 +292,9 @@ stdenv.mkDerivation ({
'' ''
else null; 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; libcCross crossMingw;
nativeBuildInputs = [ texinfo which gettext ] nativeBuildInputs = [ texinfo which gettext ]

6
pkgs/development/compilers/gcc/7/default.nix
View File

@ -26,7 +26,7 @@
, enablePlugin ? true # whether to support user-supplied plug-ins , enablePlugin ? true # whether to support user-supplied plug-ins
, name ? "gcc" , name ? "gcc"
, libcCross ? null , libcCross ? null
, crossStageStatic ? true , crossStageStatic ? false
, gnat ? null , gnat ? null
, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd
, stripped ? true , stripped ? true
@ -294,7 +294,9 @@ stdenv.mkDerivation ({
'' ''
else null; 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; libcCross crossMingw;
nativeBuildInputs = [ texinfo which gettext ] nativeBuildInputs = [ texinfo which gettext ]

6
pkgs/development/compilers/gcc/snapshot/default.nix
View File

@ -26,7 +26,7 @@
, enablePlugin ? true # whether to support user-supplied plug-ins , enablePlugin ? true # whether to support user-supplied plug-ins
, name ? "gcc" , name ? "gcc"
, libcCross ? null , libcCross ? null
, crossStageStatic ? true , crossStageStatic ? false
, gnat ? null , gnat ? null
, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd
, stripped ? true , stripped ? true
@ -281,7 +281,9 @@ stdenv.mkDerivation ({
'' ''
else null; 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; libcCross crossMingw;
nativeBuildInputs = [ texinfo which gettext ] nativeBuildInputs = [ texinfo which gettext ]

4
pkgs/top-level/all-packages.nix
View File

@ -5451,9 +5451,7 @@ with pkgs;
gccCrossStageFinal = assert targetPlatform != buildPlatform; wrapCCWith { gccCrossStageFinal = assert targetPlatform != buildPlatform; wrapCCWith {
name = "gcc-cross-wrapper"; name = "gcc-cross-wrapper";
cc = gcc.cc.override { cc = gcc.cc;
crossStageStatic = false;
};
libc = libcCross; libc = libcCross;
}; };