Commit 9a657491 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Fix the build with GHC 6.4

parent f2e53b6f
......@@ -685,6 +685,10 @@ parser/Lexer_HC_OPTS += -funbox-strict-fields
# prototype via a global option instead of a myriad of per-file OPTIONS
SRC_HC_OPTS += '-\#include "cutils.h"'
ifeq "$(ghc_ge_605)" "NO"
utils/LazyUniqFM_HC_OPTS += -fallow-undecidable-instances
endif
# ----------------------------------------------------------------------------
# Generate supporting stuff for prelude/PrimOp.lhs
# from prelude/primops.txt
......
......@@ -224,6 +224,10 @@ mkGlobalThings decls things
= (name, AClass cl)
mk_thing (L _ decl, ~(ATyCon tc))
= (tcdName decl, ATyCon tc)
#if __GLASGOW_HASKELL__ < 605
-- Old GHCs don't understand that ~... matches anything
mk_thing _ = panic "mkGlobalThings: Can't happen"
#endif
\end{code}
......
......@@ -173,6 +173,9 @@ boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \
# We ought to be depending on %/Setup.*hs, but make makes that difficult.
CABAL_GHC_FLAGS = -Wall
ifeq "$(ghc_ge_605)" "NO"
CABAL_GHC_FLAGS += -cpp
endif
$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
%/setup/Setup: $(BOOTSTRAP_STAMPS)
......
......@@ -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
......
......@@ -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
......
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment