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

gcc_multi: Fix so binutils wrapper also has glibc_multi

This commit is contained in:
John Ericson 2017-08-30 13:14:14 -04:00
parent b64736a8e4
commit ce359d49fb
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1790,7 +1790,7 @@ with pkgs;
emscripten = callPackage ../development/compilers/emscripten { }; emscripten = callPackage ../development/compilers/emscripten { };
emscriptenfastcomp-unwrapped = callPackage ../development/compilers/emscripten-fastcomp { }; emscriptenfastcomp-unwrapped = callPackage ../development/compilers/emscripten-fastcomp { };
emscriptenfastcomp-wrapped = wrapCCWith stdenv.cc.libc '' emscriptenfastcomp-wrapped = wrapCCWith stdenv.cc.libc stdenv.cc.binutils ''
# hardening flags break WASM support # hardening flags break WASM support
cat > $out/nix-support/add-hardening.sh cat > $out/nix-support/add-hardening.sh
'' emscriptenfastcomp-unwrapped; '' emscriptenfastcomp-unwrapped;
@ -5311,8 +5311,12 @@ with pkgs;
extraBuildCommands = '' extraBuildCommands = ''
echo "dontMoveLib64=1" >> $out/nix-support/setup-hook echo "dontMoveLib64=1" >> $out/nix-support/setup-hook
''; '';
in wrapCCWith glibc_multi extraBuildCommands (cc.cc.override { # Binutils with glibc multi
stdenv = overrideCC stdenv (wrapCCWith glibc_multi "" cc.cc); binutils = cc.binutils.override {
libc = glibc_multi;
};
in wrapCCWith glibc_multi binutils extraBuildCommands (cc.cc.override {
stdenv = overrideCC stdenv (wrapCCWith glibc_multi binutils "" cc.cc);
profiledCompiler = false; profiledCompiler = false;
enableMultilib = true; enableMultilib = true;
})) }))
@ -6106,20 +6110,20 @@ with pkgs;
wla-dx = callPackage ../development/compilers/wla-dx { }; wla-dx = callPackage ../development/compilers/wla-dx { };
wrapCCWith = libc: extraBuildCommands: baseCC: ccWrapperFun { wrapCCWith = libc: binutils: extraBuildCommands: baseCC: ccWrapperFun {
nativeTools = stdenv.cc.nativeTools or false; nativeTools = stdenv.cc.nativeTools or false;
nativeLibc = stdenv.cc.nativeLibc or false; nativeLibc = stdenv.cc.nativeLibc or false;
nativePrefix = stdenv.cc.nativePrefix or ""; nativePrefix = stdenv.cc.nativePrefix or "";
cc = baseCC; cc = baseCC;
isGNU = baseCC.isGNU or false; isGNU = baseCC.isGNU or false;
isClang = baseCC.isClang or false; isClang = baseCC.isClang or false;
inherit libc extraBuildCommands; inherit libc binutils extraBuildCommands;
}; };
ccWrapperFun = callPackage ../build-support/cc-wrapper; ccWrapperFun = callPackage ../build-support/cc-wrapper;
binutilsWrapperFun = callPackage ../build-support/binutils-wrapper; binutilsWrapperFun = callPackage ../build-support/binutils-wrapper;
wrapCC = wrapCCWith stdenv.cc.libc ""; wrapCC = wrapCCWith stdenv.cc.libc stdenv.cc.binutils "";
# 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 {
nativeTools = stdenv.cc.nativeTools or false; nativeTools = stdenv.cc.nativeTools or false;