From fa6c22b5c62a8569bdff5a11f11d207d03ffa045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 30 Apr 2010 19:12:59 +0000
Subject: [PATCH] Adding the expressions for gcc 4.5 for cross building.
 Although I still have set gcc 4.4 for that, I tested with the 4.5 expression
 and it cross built perfectly bison for the sheevaplug.

svn path=/nixpkgs/trunk/; revision=21463
---
 pkgs/development/compilers/gcc-4.5/default.nix |  2 +-
 pkgs/top-level/all-packages.nix                | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix
index a70de4f4e504..20cd848ded4b 100644
--- a/pkgs/development/compilers/gcc-4.5/default.nix
+++ b/pkgs/development/compilers/gcc-4.5/default.nix
@@ -81,7 +81,7 @@ let version = "4.5.0";
         " --disable-libmudflap " +
         " --disable-libgomp " +
         " --disable-shared" +
-        " --disable-decimal-float" # libdecnumber requires libc
+        " --disable-decimal-float" + # libdecnumber requires libc
         " --disable-multilib"
         else
         " --with-headers=${libcCross}/include" +
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b1b779eda56..bfbdf8b6599c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2043,9 +2043,23 @@ let
       cross = assert crossSystem != null; crossSystem;
     });
 
+  gcc45_realCross = lib.addMetaAttrs { platforms = []; }
+    (makeOverridable (import ../development/compilers/gcc-4.5) {
+      inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
+        ppl cloogppl gettext which noSysDirs;
+      binutilsCross = binutilsCross;
+      libcCross = libcCross;
+      profiledCompiler = false;
+      enableMultilib = false;
+      crossStageStatic = false;
+      cross = assert crossSystem != null; crossSystem;
+    });
+
+  gcc_realCross = gcc44_realCross;
+
   gccCrossStageStatic = wrapGCCCross {
     gcc = forceBuildDrv (lib.addMetaAttrs { platforms = []; } (
-      gcc44_realCross.override {
+      gcc_realCross.override {
         crossStageStatic = true;
         langCC = false;
         libcCross = null;
@@ -2057,7 +2071,7 @@ let
   };
 
   gccCrossStageFinal = wrapGCCCross {
-    gcc = forceBuildDrv gcc44_realCross;
+    gcc = forceBuildDrv gcc_realCross;
     libc = libcCross;
     binutils = binutilsCross;
     cross = assert crossSystem != null; crossSystem;