From 09531a24adf304fd2e49b303a61c79d48d8967c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 7 Mar 2012 16:01:07 +0000
Subject: [PATCH] GCC 4.6: Fix `gccCrossStageFinal' for GNU/Hurd.

svn path=/nixpkgs/trunk/; revision=32853
---
 pkgs/development/compilers/gcc/4.6/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
index b31f0651462..7fd65b5fecb 100644
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -44,6 +44,9 @@ with builtins;
 
 let version = "4.6.3";
 
+    # Whether building a cross-compiler for GNU/Hurd.
+    crossGNU = cross != null && cross.config == "i586-pc-gnu";
+
     patches = [ ]
       ++ optional (cross != null) ./libstdc++-target.patch
       ++ optional noSysDirs ./no-sys-dirs.patch
@@ -51,7 +54,7 @@ let version = "4.6.3";
       # target libraries and tools.
       ++ optional langAda ./gnat-cflags.patch
       ++ optional langVhdl ./ghdl-ortho-cflags.patch
-      ++ optional stdenv.isGNU ./hurd-sigrtmin.patch;
+      ++ optional (stdenv.isGNU || crossGNU) ./hurd-sigrtmin.patch;
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
@@ -150,12 +153,11 @@ stdenv.mkDerivation ({
   inherit patches;
 
   postPatch =
-    if (stdenv.system == "i586-pc-gnu"
+    if (stdenv.isGNU
         || (libcCross != null                  # e.g., building `gcc.hostDrv'
             && libcCross ? crossConfig
             && libcCross.crossConfig == "i586-pc-gnu")
-        || (cross != null && cross.config == "i586-pc-gnu"
-            && libcCross != null))
+        || (crossGNU && libcCross != null))
     then
       # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
       # in glibc, so add the right `-I' flags to the default spec string.