X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compat%2FMakefile;h=dafb8a0ff00a23d99d08a8113980098ca556f1c0;hb=847b9f6ac38debcf856df3c498ba7f4a7618cdd1;hp=fe7aa7956ee8baa2863ab0af514399da3530613e;hpb=bc49cbd35e1b9a75ef05de610f845de7bbfef90d;p=ghc-hetmet.git

diff --git a/compat/Makefile b/compat/Makefile
index fe7aa79..dafb8a0 100644
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -6,9 +6,12 @@ ALL_DIRS = \
 	Compat \
 	Distribution \
 	Distribution/Compat \
+	Distribution/Simple \
 	Language/Haskell \
 	System \
+	System/FilePath \
 	System/Directory \
+	Trace/Hpc \
 	cbits
 
 SplitObjs=NO
@@ -20,6 +23,12 @@ NO_INSTALL_LIBRARY = YES
 # Avoid building the GHCi lib, since we don't need it
 GhcWithInterpreter = NO
 
+# There are lots of warnings in here due to things like modules being
+# imported that, in some versions of GHC, aren't used. Thus we don't
+# give any warnings in here, and therefore validating with -Werror won't
+# make the build fail.
+SRC_HC_OPTS += -w
+
 # Needed so that the libraries can #include relative to this directory.
 INCLUDE_DIRS=-I. -Iinclude
 
@@ -48,22 +57,25 @@ SRC_HC_OPTS += $(filter-out -D%, $(GhcHcOpts) $(GhcStage1HcOpts))
 # CPP symbol, so we have to do it by hand:
 SRC_CC_OPTS += -D__GHC_PATCHLEVEL__=$(GhcPatchLevel)
 
-ifeq "$(ghc_ge_603)" "YES"
-# These modules are provided in GHC 6.3+
-EXCLUDED_SRCS += \
-	System/Directory/Internals.hs
-
-SRC_MKDEPENDHS_OPTS += \
-	-optdep--exclude-module=System.Directory.Internals
+# This module shouldn't be compiled itself, only #included into other files
+EXCLUDED_SRCS += System/FilePath/Internal.hs
 
+ifneq "$(ghc_ge_607)" "YES"
 # 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
+
+ifeq "$(ghc_ge_607)" "YES"
+SRC_HC_OPTS += -package directory
+SRC_HC_OPTS += -package pretty
 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
@@ -73,6 +85,10 @@ Distribution/ParseUtils.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/
 Distribution/Compiler.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Compiler.hs
 Distribution/Version.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Version.hs
 Language/Haskell/Extension.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Language/Haskell/Extension.hs
+Trace/Hpc/Mix.$(way_)o :  $(FPTOOLS_TOP)/libraries/hpc/Trace/Hpc/Mix.hs
+Trace/Hpc/Util.$(way_)o :  $(FPTOOLS_TOP)/libraries/hpc/Trace/Hpc/Util.hs
+Trace/Hpc/Tix.$(way_)o :  $(FPTOOLS_TOP)/libraries/hpc/Trace/Hpc/Tix.hs
+
 cbits/unicode.o : $(FPTOOLS_TOP)/libraries/base/cbits/WCsubst.c $(FPTOOLS_TOP)/libraries/base/include/WCsubst.h
 
 SRC_CC_OPTS += -I$(FPTOOLS_TOP)/libraries/base/cbits -I$(FPTOOLS_TOP)/libraries/base/include