mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-02 18:47:58 +03:00
Use gcc48_multi for stdenv_32bit
Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
parent
6bdafbad9b
commit
c373a49b10
@ -247,7 +247,7 @@ let
|
|||||||
# just the plain stdenv.
|
# just the plain stdenv.
|
||||||
stdenv_32bit = lowPrio (
|
stdenv_32bit = lowPrio (
|
||||||
if system == "x86_64-linux" then
|
if system == "x86_64-linux" then
|
||||||
overrideGCC stdenv gcc46_multi
|
overrideGCC stdenv gcc48_multi
|
||||||
else
|
else
|
||||||
stdenv);
|
stdenv);
|
||||||
|
|
||||||
@ -2478,15 +2478,6 @@ let
|
|||||||
texinfo = texinfo413;
|
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 {
|
gcc48 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 {
|
||||||
inherit noSysDirs;
|
inherit noSysDirs;
|
||||||
|
|
||||||
@ -2504,6 +2495,15 @@ let
|
|||||||
else null;
|
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 {
|
gcc48_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.8 {
|
||||||
stripped = false;
|
stripped = false;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user