FIX BUILD with ghc-6.2.x

[ghc-hetmet.git] / compat / Makefile

diff --git a/compat/Makefile b/compat/Makefile
index b4e18c9..0e24ccb 100644 (file)
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -8,6 +8,7 @@ ALL_DIRS = \
        Distribution/Compat \
        Language/Haskell \
        System \
+       System/FilePath \
        System/Directory \
        cbits
 
@@ -41,13 +42,16 @@ UseGhcForCc = YES
 # In this particular case, it turned out that -DDEBUG made Cabal 
 # import HUnit, which might not be installed for the compiler we are
 # 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) $(GhcStage1HcOpts)) 
 
 # 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)
 
+# This module shouldn't be compiled itself, only #included into other files
+EXCLUDED_SRCS += System/FilePath/Internal.hs
+
 ifeq "$(ghc_ge_603)" "YES"
 # These modules are provided in GHC 6.3+
 EXCLUDED_SRCS += \
@@ -58,6 +62,9 @@ SRC_MKDEPENDHS_OPTS += \
 
 # GHC 6.3+ has Cabal, but we're replacing it:
 SRC_HC_OPTS += -ignore-package Cabal
+
+# only GHC 6.3+ has -ignore-package
+SRC_HC_OPTS += -ignore-package filepath
 endif
 
 # Some explicit dependencies, needed because ghc -M can't discover the