From f088ea20a31a30afa62173d9d53971ffb7e59cd7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 15 Apr 2009 13:28:17 +0000
Subject: [PATCH] * Small cleanup.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15066
---
 pkgs/top-level/all-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f585332b2830..01d8741da3df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -213,7 +213,7 @@ let
   # just the plain stdenv.
   stdenv_32bit =
     if system == "x86_64-linux" then
-      overrideGCC stdenv gcc43multi
+      overrideGCC stdenv gcc43_multi
     else
       stdenv;
 
@@ -1590,9 +1590,8 @@ let
     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);
-    inherit fetchurl texinfo gmp mpfr noSysDirs;
     profiledCompiler = false;
     enableMultilib = true;
   }));