X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compat%2FMakefile;h=fb28e2c4952d3db1a5c321079c370042555a69c2;hb=eae65ca88fc09342e295874fb253f83775c61051;hp=b09e1c2322bb50a5a59e1d2d1eb939d23210dd47;hpb=a8ef5634ef302acac8fb70fcdeddbdbdfe2a18d9;p=ghc-hetmet.git

diff --git a/compat/Makefile b/compat/Makefile
index b09e1c2..fb28e2c 100644
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -4,12 +4,6 @@ include $(TOP)/mk/boilerplate.mk
 ALL_DIRS = \
 	Data \
 	Compat \
-	Distribution \
-	Distribution/Compat \
-	Language/Haskell \
-	System \
-	System/FilePath \
-	System/Directory \
 	Trace/Hpc \
 	cbits
 
@@ -22,6 +16,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
 
@@ -53,35 +53,17 @@ 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 += \
-	System/Directory/Internals.hs
-
-SRC_MKDEPENDHS_OPTS += \
-	-optdep--exclude-module=System.Directory.Internals
-
-# 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
+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/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
-Distribution/License.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/License.hs
-Distribution/Package.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Package.hs
-Distribution/ParseUtils.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/ParseUtils.hs
-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
 
@@ -90,7 +72,13 @@ SRC_CC_OPTS += -I$(FPTOOLS_TOP)/libraries/base/cbits -I$(FPTOOLS_TOP)/libraries/
 # Make the #includes in the stubs independent of the current location
 SRC_HC_OPTS += -I$(FPTOOLS_TOP)/libraries
 
-SRC_HC_OPTS +=  -fglasgow-exts -no-recomp
+SRC_HC_OPTS +=  -fglasgow-exts
+
+ifeq "$(ghc_ge_609)" "YES"
+SRC_HC_OPTS += -fforce-recomp
+else
+SRC_HC_OPTS += -no-recomp
+endif
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 Compat/Directory_HC_OPTS += -\#include shlobj.h