From 6c90f914633ecc97bb67820595c0ace4138b3879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 12 Nov 2011 23:55:53 +0000 Subject: [PATCH] GCC 4.5: Fix the Canadian cross, aka. `gcc45.hostDrv'. svn path=/nixpkgs/trunk/; revision=30403 --- pkgs/development/compilers/gcc-4.5/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 5f99ad89434..d5791d08ecf 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -395,6 +395,13 @@ stdenv.mkDerivation ({ }; } +// optionalAttrs (cross != null || libcCross != null) { + # `builder.sh' sets $CPP, which leads configure to use "gcc -E" instead of, + # say, "i586-pc-gnu-gcc -E" when building `gcc.hostDrv'. + # FIXME: Fix `builder.sh' directly in the next stdenv-update. + postUnpack = "unset CPP"; +} + // optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) { makeFlags = [ "all-gcc" "all-target-libgcc" ]; installTargets = "install-gcc install-target-libgcc";