From 0752b1e3d722c768f1ea8a968dd8fc43f5990557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 11 Mar 2012 17:35:45 +0000
Subject: [PATCH] GCC 4.7: Make sure `stdenv.glibc' exists before using it.

svn path=/nixpkgs/trunk/; revision=32995
---
 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 1e30e74ab3802e..59540ea6ef2aed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1934,7 +1934,6 @@ let
     binutilsCross = null;
   }));
 
-/* needs to be fixed:
   gcc47 = lowPrio (wrapGCC (lib.overrideDerivation gcc46_debug.gcc (a: {
     name = "gcc-debug-4.7.0rc20120302";
     src = fetchurl {
@@ -1944,11 +1943,11 @@ let
 
     configureFlags = a.configureFlags
       # This flag replaces `no-sys-dirs.patch'.
-      + " --with-native-system-header-dir=${stdenv.glibc}/include";
+      + (lib.optionalString (stdenv ? glibc)
+          " --with-native-system-header-dir=${stdenv.glibc}/include");
 
     patches = [];
   })));
-*/
 
   gccApple =
     wrapGCC ( (if stdenv.system == "i686-darwin" then import ../development/compilers/gcc/4.2-apple32 else import ../development/compilers/gcc/4.2-apple64) {