alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

wrapCC: Alias now does the right thing for cross

Browse source 
Unfortunately this makes previously-barely-working overrides have
infinite recursion, so I had to reinstantiate gcc for gccCrossStageFinal
instead.
This commit is contained in:
John Ericson 2017-09-20 15:20:00 -04:00
parent 54282b9610
commit 88a0e55ce0
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/top-level/all-packages.nix
View file

@ -5377,6 +5377,7 @@ with pkgs;
gambit = callPackage ../development/compilers/gambit { }; gambit = callPackage ../development/compilers/gambit { };
gerbil = callPackage ../development/compilers/gerbil { }; gerbil = callPackage ../development/compilers/gerbil { };
gccFun = callPackage ../development/compilers/gcc/6;
gcc = gcc6; gcc = gcc6;
gcc-unwrapped = gcc.cc; gcc-unwrapped = gcc.cc;
@ -5432,12 +5433,18 @@ with pkgs;
else null; else null;
in wrapCCWith { in wrapCCWith {
name = "gcc-cross-wrapper"; name = "gcc-cross-wrapper";
cc = gcc.cc.override { cc = gccFun {
# copy-pasted
inherit noSysDirs;
# PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
isl = if !stdenv.isDarwin then isl_0_14 else null;
# just for stage static
crossStageStatic = true; crossStageStatic = true;
langCC = false; langCC = false;
libcCross = libcCross1; libcCross = libcCross1;
enableShared = false; enableShared = false;
# Why is this needed?
}; };
libc = libcCross1; libc = libcCross1;
}; };
@ -6220,7 +6227,7 @@ with pkgs;
wrapCC = cc: wrapCCWith { wrapCC = cc: wrapCCWith {
inherit cc; inherit cc;
inherit (stdenv.cc) libc; libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc;
}; };
# legacy version, used for gnat bootstrapping # legacy version, used for gnat bootstrapping
wrapGCC-old = baseGCC: callPackage ../build-support/gcc-wrapper-old { wrapGCC-old = baseGCC: callPackage ../build-support/gcc-wrapper-old {