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

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

Browse Source 
gcc-*: Clean up crossStageStatic logic
This commit is contained in:
John Ericson 2018-09-25 00:01:28 -04:00 committed by GitHub
commit b1d518206a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,9 +201,7 @@ stdenv.mkDerivation ({
'' ''
else null; else null;
# TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, inherit noSysDirs staticCompiler langJava crossStageStatic
crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
inherit noSysDirs staticCompiler langJava
libcCross crossMingw; libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];

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

@ -210,9 +210,7 @@ stdenv.mkDerivation ({
'' ''
else null; else null;
# TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, inherit noSysDirs staticCompiler langJava crossStageStatic
crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
inherit noSysDirs staticCompiler langJava
libcCross crossMingw; libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];

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

@ -215,9 +215,7 @@ stdenv.mkDerivation ({
) )
else null; else null;
# TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, inherit noSysDirs staticCompiler langJava crossStageStatic
crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
inherit noSysDirs staticCompiler langJava
libcCross crossMingw; libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];

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

@ -216,9 +216,7 @@ stdenv.mkDerivation ({
) )
else null; else null;
# TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, inherit noSysDirs staticCompiler langJava crossStageStatic
crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
inherit noSysDirs staticCompiler langJava
libcCross crossMingw; libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];

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

@ -189,9 +189,7 @@ stdenv.mkDerivation ({
) )
else ""); else "");
# TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, inherit noSysDirs staticCompiler crossStageStatic
crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
inherit noSysDirs staticCompiler
libcCross crossMingw; libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];

4
pkgs/development/compilers/gcc/8/default.nix
View File

@ -184,9 +184,7 @@ stdenv.mkDerivation ({
) )
else ""); else "");
# TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, inherit noSysDirs staticCompiler crossStageStatic
crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
inherit noSysDirs staticCompiler
libcCross crossMingw; libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];

2
pkgs/development/compilers/gcc/builder.sh
View File

@ -131,7 +131,7 @@ if test "$noSysDirs" = "1"; then
) )
fi fi
if test -n "${targetConfig-}" -a "$crossStageStatic" == 1; then if test "$crossStageStatic" == 1; then
# We don't want the gcc build to assume there will be a libc providing # We don't want the gcc build to assume there will be a libc providing
# limits.h in this stagae # limits.h in this stagae
makeFlagsArray+=( makeFlagsArray+=(

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

@ -154,9 +154,7 @@ stdenv.mkDerivation ({
'' ''
else null; else null;
# TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, inherit noSysDirs staticCompiler crossStageStatic
crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
inherit noSysDirs staticCompiler
libcCross crossMingw; libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];