From fa97f540015f485faa6fecf0dbd4b4f41cdd96ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 13 Nov 2011 14:39:15 +0000 Subject: [PATCH] GCC 4.5: Fix `gcc45.hostDrv' for GNU. This fixes a regression introduced in r30410 ("Do not apply Hurd-specific fixes for simple cross-Linux. Unfortunately, still no luck with my ARM device"). svn path=/nixpkgs/trunk/; revision=30412 --- pkgs/development/compilers/gcc-4.5/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 1e4a98805ba..950243bebe7 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -147,6 +147,8 @@ stdenv.mkDerivation ({ postPatch = if (stdenv.system == "i586-pc-gnu" + || (libcCross != null # e.g., building `gcc.hostDrv' + && libcCross.crossConfig == "i586-pc-gnu") || (cross != null && cross.config == "i586-pc-gnu" && libcCross != null)) then