GCC 4.5: Fix the Canadian cross, aka. `gcc45.hostDrv'.

svn path=/nixpkgs/trunk/; revision=30403
This commit is contained in:
Ludovic Courtès 2011-11-12 23:55:53 +00:00
parent f68d9d7c29
commit 6c90f91463

View File

@ -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) { // optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
makeFlags = [ "all-gcc" "all-target-libgcc" ]; makeFlags = [ "all-gcc" "all-target-libgcc" ];
installTargets = "install-gcc install-target-libgcc"; installTargets = "install-gcc install-target-libgcc";