summaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2013-01-29 09:34:50 +0000
committerSimon Marlow <marlowsd@gmail.com>2013-01-29 10:12:28 +0000
commitbc31dbe8ee22819054df60f5ef219fed393a1c54 (patch)
tree44c06f54816c780873984e0e73b6ec50edc98b4b /ghc.mk
parent1b7c1e52f207fa6038d729048b81bddb7d7ea2b1 (diff)
downloadhaskell-bc31dbe8ee22819054df60f5ef219fed393a1c54.tar.gz
Disable any packages built with stage 2 when cross-compiling
Since we can't run stage 2 on the host.
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/ghc.mk b/ghc.mk
index c88ad54e04..120954b5d6 100644
--- 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