[commit: ghc] master: Disable any packages built with stage 2 when cross-compiling (bc31dbe)

Simon Marlow marlowsd at gmail.com
Tue Jan 29 11:12:41 CET 2013


Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/bc31dbe8ee22819054df60f5ef219fed393a1c54

>---------------------------------------------------------------

commit bc31dbe8ee22819054df60f5ef219fed393a1c54
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Tue Jan 29 09:34:50 2013 +0000

    Disable any  packages built with stage 2 when cross-compiling
    
    Since we can't run stage 2 on the host.

>---------------------------------------------------------------

 ghc.mk |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index c88ad54..120954b 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





More information about the ghc-commits mailing list