3
0
Fork 0
forked from mirrors/nixpkgs

* Small cleanup.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15066
This commit is contained in:
Eelco Dolstra 2009-04-15 13:28:17 +00:00
parent a4c304ef84
commit f088ea20a3

View file

@ -213,7 +213,7 @@ let
# just the plain stdenv. # just the plain stdenv.
stdenv_32bit = stdenv_32bit =
if system == "x86_64-linux" then if system == "x86_64-linux" then
overrideGCC stdenv gcc43multi overrideGCC stdenv gcc43_multi
else else
stdenv; stdenv;
@ -1590,9 +1590,8 @@ let
profiledCompiler = true; profiledCompiler = true;
}); });
gcc43multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (import ../development/compilers/gcc-4.3 { gcc43_multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc43_real.gcc.override {
stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc); stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc);
inherit fetchurl texinfo gmp mpfr noSysDirs;
profiledCompiler = false; profiledCompiler = false;
enableMultilib = true; enableMultilib = true;
})); }));