diff options
author | Shea Levy <shea@shealevy.com> | 2014-01-21 16:12:41 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2014-01-21 16:12:41 -0500 |
commit | c373a49b10c8f854adcbf895916a9b53d33b8db7 (patch) | |
tree | 8c1b83f694336b15ab78fec852c3b72f29545e7f | |
parent | 6bdafbad9b573720b0e1f42508bff0a614b6871a (diff) | |
download | nixlib-c373a49b10c8f854adcbf895916a9b53d33b8db7.tar nixlib-c373a49b10c8f854adcbf895916a9b53d33b8db7.tar.gz nixlib-c373a49b10c8f854adcbf895916a9b53d33b8db7.tar.bz2 nixlib-c373a49b10c8f854adcbf895916a9b53d33b8db7.tar.lz nixlib-c373a49b10c8f854adcbf895916a9b53d33b8db7.tar.xz nixlib-c373a49b10c8f854adcbf895916a9b53d33b8db7.tar.zst nixlib-c373a49b10c8f854adcbf895916a9b53d33b8db7.zip |
Use gcc48_multi for stdenv_32bit
Signed-off-by: Shea Levy <shea@shealevy.com>
-rw-r--r-- | pkgs/top-level/all-packages.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f188da5ce6e9..f1ab8ef3f9d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |