From 7ef8d2474b4522abab85d487e4505a99f2e67d0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 23 Jan 2010 00:24:52 +0000
Subject: [PATCH] Fixing the cross-compiler build on i686-linux

svn path=/nixpkgs/branches/stdenv-updates/; revision=19626
---
 pkgs/development/compilers/gcc-4.4/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix
index c0c4f6cda21f..741c440f92f9 100644
--- a/pkgs/development/compilers/gcc-4.4/default.nix
+++ b/pkgs/development/compilers/gcc-4.4/default.nix
@@ -151,7 +151,7 @@ stdenv.mkDerivation ({
       )
     }
     ${if langAda then " --enable-libada" else ""}
-    ${if stdenv.isi686 then "--with-arch=i686" else ""}
+    ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
     ${if cross != null then crossConfigureFlags else ""}
   ";