all-packages: Remove gccCrossStageFinal; any gcc will not work

This commit is contained in:
John Ericson 2017-09-20 15:31:07 -04:00
parent 88a0e55ce0
commit b9bf90ca6c
4 changed files with 7 additions and 10 deletions

View file

@ -2,7 +2,7 @@
args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
, texinfo, glibcCross, hurdPartedCross, libuuid, samba , texinfo, glibcCross, hurdPartedCross, libuuid, samba
, gccCrossStageStatic, gccCrossStageFinal , gccCrossStageStatic, gcc
, forceSystem, newScope, platform, config , forceSystem, newScope, platform, config
, targetPlatform, buildPlatform , targetPlatform, buildPlatform
, overrides ? {} , overrides ? {}
@ -28,7 +28,7 @@ let
automake = automake111x; automake = automake111x;
headersOnly = false; headersOnly = false;
cross = assert targetPlatform != buildPlatform; targetPlatform; cross = assert targetPlatform != buildPlatform; targetPlatform;
gccCross = gccCrossStageFinal; gccCross = gcc;
}; };
hurdCrossIntermediate = forcedNativePackages.callPackage ./hurd { hurdCrossIntermediate = forcedNativePackages.callPackage ./hurd {

View file

@ -35,7 +35,7 @@ in bootStages ++ [
targetPlatform = crossSystem; targetPlatform = crossSystem;
cc = if crossSystem.useiOSCross or false cc = if crossSystem.useiOSCross or false
then buildPackages.darwin.ios-cross then buildPackages.darwin.ios-cross
else buildPackages.gccCrossStageFinal; else buildPackages.gcc;
}; };
}) })

View file

@ -5426,6 +5426,8 @@ with pkgs;
cc = buildPackages.gccCrossStageStatic; cc = buildPackages.gccCrossStageStatic;
}; };
# The GCC used to build libc for the target platform. Normal gccs will be
# built with, and use, that cross-compiled libc.
gccCrossStageStatic = assert targetPlatform != buildPlatform; let gccCrossStageStatic = assert targetPlatform != buildPlatform; let
libcCross1 = libcCross1 =
if targetPlatform.libc == "msvcrt" then __targetPackages.windows.mingw_w64_headers if targetPlatform.libc == "msvcrt" then __targetPackages.windows.mingw_w64_headers
@ -5456,12 +5458,6 @@ with pkgs;
libc = windows.mingw_headers2; libc = windows.mingw_headers2;
}; };
gccCrossStageFinal = assert targetPlatform != buildPlatform; wrapCCWith {
name = "gcc-cross-wrapper";
cc = gcc.cc;
libc = libcCross;
};
gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 { gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 {
inherit noSysDirs; inherit noSysDirs;
texinfo = texinfo4; texinfo = texinfo4;
@ -6226,6 +6222,7 @@ with pkgs;
ccWrapperFun = callPackage ../build-support/cc-wrapper; ccWrapperFun = callPackage ../build-support/cc-wrapper;
wrapCC = cc: wrapCCWith { wrapCC = cc: wrapCCWith {
name = lib.optionalString (targetPlatform != hostPlatform) "gcc-cross-wrapper";
inherit cc; inherit cc;
libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc;
}; };

View file

@ -19,7 +19,7 @@ let
}; };
gnuCommon = lib.recursiveUpdate common { gnuCommon = lib.recursiveUpdate common {
buildPackages.gccCrossStageFinal = nativePlatforms; buildPackages.gcc = nativePlatforms;
coreutils = nativePlatforms; coreutils = nativePlatforms;
}; };