mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 23:52:33 +00:00
Code Issues Wiki Activity

Use gcc48_multi for stdenv_32bit

Browse source 
Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2014-01-21 16:12:41 -05:00
parent 6bdafbad9b
commit c373a49b10
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -247,7 +247,7 @@ let
# just the plain stdenv.
stdenv_32bit = lowPrio (
if system == "x86_64-linux" then
overrideGCC stdenv gcc46_multi
overrideGCC stdenv gcc48_multi
else
stdenv);
@ -2478,15 +2478,6 @@ let
texinfo = texinfo413;
}));
gcc46_multi =
if system == "x86_64-linux" then lowPrio (
wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override {
stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc);
profiledCompiler = false;
enableMultilib = true;
}))
else throw "Multilib gcc not supported on ‘${system}’";
gcc48 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 {
inherit noSysDirs;
@ -2504,6 +2495,15 @@ let
else null;
}));
gcc48_multi =
if system == "x86_64-linux" then lowPrio (
wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc48.gcc.override {
stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc);
profiledCompiler = false;
enableMultilib = true;
}))
else throw "Multilib gcc not supported on ‘${system}’";
gcc48_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 {
stripped = false;