diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-06-23 14:44:26 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-06-23 14:44:26 +0000 |
| commit | 9a657491d1caf6e29c85ce71e95a36eea3e036b1 (patch) | |
| tree | 52efd41f503e023f2bb7a25fdcad33366d3e0941 /utils | |
| parent | f2e53b6f1045941243d2d5e76e9b01b6e769ddd9 (diff) | |
| download | haskell-9a657491d1caf6e29c85ce71e95a36eea3e036b1.tar.gz | |
Fix the build with GHC 6.4
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/genapply/Makefile | 5 | ||||
| -rw-r--r-- | utils/hsc2hs/Makefile | 4 | ||||
| -rw-r--r-- | utils/runghc/Makefile | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/utils/genapply/Makefile b/utils/genapply/Makefile index ba13de2374..64489db1ac 100644 --- a/utils/genapply/Makefile +++ b/utils/genapply/Makefile @@ -17,7 +17,12 @@ SRC_HC_OPTS += -package pretty endif # Try to get dependencies right... +ifeq "$(ghc_ge_605)" "YES" SRC_HC_OPTS += -fforce-recomp +else +SRC_HC_OPTS += -no-recomp +endif + GenApply.o : $(GHC_INCLUDE_DIR)/ghcconfig.h GenApply.o : $(GHC_INCLUDE_DIR)/MachRegs.h GenApply.o : $(GHC_INCLUDE_DIR)/Constants.h diff --git a/utils/hsc2hs/Makefile b/utils/hsc2hs/Makefile index c30269dd20..7763183c8b 100644 --- a/utils/hsc2hs/Makefile +++ b/utils/hsc2hs/Makefile @@ -14,6 +14,10 @@ SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS)) endif +ifeq "$(ghc_ge_605)" "NO" +SRC_HC_OPTS += -cpp +endif + # This causes libghccompat.a to be used: include $(GHC_COMPAT_DIR)/compat.mk diff --git a/utils/runghc/Makefile b/utils/runghc/Makefile index 557940b611..54245a3397 100644 --- a/utils/runghc/Makefile +++ b/utils/runghc/Makefile @@ -10,6 +10,10 @@ SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS)) endif +ifeq "$(ghc_ge_605)" "NO" +SRC_HC_OPTS += -cpp +endif + # We have two version: the inplace version compiled by the bootstrap compiler # and the install version compiled by the stage 1 compiler ifeq "$(stage)" "2" |