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

wrapCCMulti: split from gcc_multi

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-12 19:15:14 +03:00
parent 71e7f0cad4
commit 391c3e505e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4044,18 +4044,20 @@ in
gcc = gcc5; gcc = gcc5;
gcc_multi = wrapCCMulti = cc:
if system == "x86_64-linux" then lowPrio ( if system == "x86_64-linux" then lowPrio (
let let
extraBuildCommands = '' extraBuildCommands = ''
echo "dontMoveLib64=1" >> $out/nix-support/setup-hook echo "dontMoveLib64=1" >> $out/nix-support/setup-hook
''; '';
in wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi extraBuildCommands (gcc.cc.override { in wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi extraBuildCommands (cc.cc.override {
stdenv = overrideCC stdenv (wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi "" gcc.cc); stdenv = overrideCC stdenv (wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi "" cc.cc);
profiledCompiler = false; profiledCompiler = false;
enableMultilib = true; enableMultilib = true;
})) }))
else throw "Multilib gcc not supported on ‘${system}’"; else throw "Multilib ${cc.name} not supported on ‘${system}’";
gcc_multi = wrapCCMulti gcc;
gcc_debug = lowPrio (wrapCC (gcc.cc.override { gcc_debug = lowPrio (wrapCC (gcc.cc.override {
stripped = false; stripped = false;