X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compat%2FMakefile;h=61cc6c04fc1d7c181675c8c38e63cbf55fb80582;hb=f750bec77c4f1b6d986dfa237df63a70689e9849;hp=b4e18c9bbc00a45c6cc71a5cdbb221fb3f18e7b7;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/compat/Makefile b/compat/Makefile
index b4e18c9..61cc6c0 100644
--- 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,12 +62,14 @@ 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
 # true dependencies of these stub files.
-System/Directory/Internals.$(way_)o : $(FPTOOLS_TOP)/libraries/base/System/Directory/Internals.hs
-Distribution/Compat/FilePath.$(way_) : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Compat/FilePath.hs
+System/Directory/Internals.$(way_)o : $(FPTOOLS_TOP)/libraries/directory/System/Directory/Internals.hs
 Distribution/Compat/ReadP.$(way_) : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Compat/ReadP.hs
 Distribution/GetOpt.$(way_)o    : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/GetOpt.hs
 Distribution/InstalledPackageInfo.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/InstalledPackageInfo.hs