Commit 71f2cb60 authored by Simon Marlow's avatar Simon Marlow
Browse files

fix the build with GHC 6.4 (not 6.4.1)

parent 14f70d83
...@@ -43,6 +43,11 @@ UseGhcForCc = YES ...@@ -43,6 +43,11 @@ UseGhcForCc = YES
# compiling with (e.g. 6.2.1). Hence the filter-out. # compiling with (e.g. 6.2.1). Hence the filter-out.
SRC_HC_OPTS += $(filter-out -D%, $(GhcHcOpts)) SRC_HC_OPTS += $(filter-out -D%, $(GhcHcOpts))
# GHC 6.4 didn't have WCsubst.c, but 6.4.1 did, and we need to know
# this in cbits/unicode.c The patchlevel isn't normally exposed as a
# CPP symbol, so we have to do it by hand:
SRC_CC_OPTS += -D__GHC_PATCHLEVEL__=$(GhcPatchLevel)
ifeq "$(ghc_ge_603)" "YES" ifeq "$(ghc_ge_603)" "YES"
# These modules are provided in GHC 6.3+ # These modules are provided in GHC 6.3+
EXCLUDED_SRCS += \ EXCLUDED_SRCS += \
......
#if __GLASGOW_HASKELL__ < 604 #if __GLASGOW_HASKELL__ < 604 || (__GLASGOW_HASKELL__==604 && __GHC_PATCHLEVEL__==0)
#include "WCsubst.c" #include "WCsubst.c"
#endif #endif
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