Disable any packages built with stage 2 when cross-compiling
authorSimon Marlow <marlowsd@gmail.com>
Tue, 29 Jan 2013 09:34:50 +0000 (09:34 +0000)
committerSimon Marlow <marlowsd@gmail.com>
Tue, 29 Jan 2013 10:12:28 +0000 (10:12 +0000)
Since we can't run stage 2 on the host.

ghc.mk

diff --git a/ghc.mk b/ghc.mk
index c88ad54..120954b 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -400,7 +400,9 @@ endef
 define addPackage # args: $1 = package, $2 = condition
 ifneq "$(filter $1,$(PKGS_THAT_USE_TH)) $(GhcProfiled)" "$1 YES"
 ifeq "$(filter $1,$(PKGS_THAT_BUILD_WITH_STAGE2))" "$1"
+ifneq "$(CrossCompiling)" "YES"
 $(call addPackageGeneral,PACKAGES_STAGE2,$1,$2)
+endif
 else
 $(call addPackageGeneral,PACKAGES_STAGE1,$1,$2)
 endif