From bff99fe8b52c5a0c19bc298b86549a470c578fb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 1 Sep 2011 14:28:13 +0000
Subject: [PATCH] Making gcc 4.6 that of stdenv.

svn path=/nixpkgs/branches/stdenv-updates/; revision=28958
---
 pkgs/stdenv/linux/default.nix   | 7 +++++--
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index ce10399eb5d..315c0895d20 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -218,10 +218,13 @@ rec {
         static = true;
       };
     };
-    cloogppl = stdenvLinuxBoot3Pkgs.cloogppl.override {
-      inherit ppl;
+    cloog = stdenvLinuxBoot3Pkgs.cloog.override {
+      isl = stdenvLinuxBoot3Pkgs.isl.override {
+        static = true;
+      };
       static = true;
     };
+    cloogppl = null;
   });
 
   # 8) Construct a fourth stdenv identical to the second, except that
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fec298e6ae..4dbc58aa27d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1642,7 +1642,7 @@ let
 
   gambit = callPackage ../development/compilers/gambit { };
 
-  gcc = gcc45;
+  gcc = gcc46;
 
   gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 {
     inherit fetchurl stdenv noSysDirs;