From fe75d617b2466f9b6bc8e0d0f6920a351ffbdefc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 1 Dec 2009 15:20:13 +0000
Subject: [PATCH] Setting gcc 4.3.4 as the default cross-gcc, and fixing
 glibc-2.10 for cross building with it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18736
---
 pkgs/development/libraries/glibc-2.10/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/glibc-2.10/default.nix b/pkgs/development/libraries/glibc-2.10/default.nix
index f65f8b6b49f1..49ee71af5060 100644
--- a/pkgs/development/libraries/glibc-2.10/default.nix
+++ b/pkgs/development/libraries/glibc-2.10/default.nix
@@ -45,7 +45,7 @@ EOF
         export AR="$crossConfig-ar"
         export RANLIB="$crossConfig-ranlib"
 
-        dontStrip = 1
+        dontStrip=1
       '';
    }
    else {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a3435301ed51..aa41f8c43615 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1801,7 +1801,7 @@ let
   };
 
   gccCrossStageStatic = cross: wrapGCCCross {
-    gcc = forceBuildDrv ((gcc44_realCross cross).override {
+    gcc = forceBuildDrv ((gcc43_realCross cross).override {
         crossStageStatic = true;
         langCC = false;
         glibcCross = null;
@@ -1812,7 +1812,7 @@ let
   };
 
   gccCrossStageFinal = cross: wrapGCCCross {
-    gcc = forceBuildDrv (gcc44_realCross cross);
+    gcc = forceBuildDrv (gcc43_realCross cross);
     libc = glibcCross cross;
     binutils = binutilsCross cross;
     inherit cross;