X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compat%2Fcompat.mk;h=c2bfeb183305ebca71cabe6ed4bc869542a22c55;hb=501db4a71483f4a6943008dd4c84e01fb9b55170;hp=db1a6c2cf99d9eae52daf3146b7a583b792d8aa1;hpb=af9b4778a1ecf24da8f231b7a06b72eb9195ddd2;p=ghc-hetmet.git

diff --git a/compat/compat.mk b/compat/compat.mk
index db1a6c2..c2bfeb1 100644
--- a/compat/compat.mk
+++ b/compat/compat.mk
@@ -15,8 +15,12 @@ SRC_HC_OPTS += -i$(GHC_COMPAT_DIR)
 SRC_LD_OPTS += -L$(GHC_COMPAT_DIR) -lghccompat
 
 # Do *not* use the installed Cabal:
-ifeq "$(ghc_ge_603)" "YES"
 SRC_HC_OPTS += -ignore-package Cabal
+
+ifeq "$(ghc_ge_607)" "YES"
+SRC_HC_OPTS += -package directory
+SRC_HC_OPTS += -package pretty
+SRC_HC_OPTS += -package containers
 endif
 
 # And similarly for when booting from .hc files:
@@ -32,8 +36,6 @@ endif
 # This is horrible.  We ought to be able to omit the entire directory
 # from mkDependHS.
 SRC_MKDEPENDHS_OPTS += \
-	-optdep--exclude-module=Compat.RawSystem \
-	-optdep--exclude-module=Compat.Directory \
 	-optdep--exclude-module=Compat.Unicode \
 	-optdep--exclude-module=Distribution.Compat.FilePath \
 	-optdep--exclude-module=Distribution.Compat.ReadP \
@@ -41,14 +43,19 @@ SRC_MKDEPENDHS_OPTS += \
 	-optdep--exclude-module=Distribution.GetOpt \
 	-optdep--exclude-module=Distribution.InstalledPackageInfo \
 	-optdep--exclude-module=Distribution.License \
+	-optdep--exclude-module=Distribution.ModuleName \
 	-optdep--exclude-module=Distribution.Package \
 	-optdep--exclude-module=Distribution.ParseUtils \
 	-optdep--exclude-module=Distribution.Compiler \
 	-optdep--exclude-module=Distribution.Version \
+	-optdep--exclude-module=Distribution.ReadE \
+	-optdep--exclude-module=Distribution.Text \
 	-optdep--exclude-module=System.FilePath \
 	-optdep--exclude-module=System.FilePath.Posix \
 	-optdep--exclude-module=System.FilePath.Windows \
-	-optdep--exclude-module=System.Directory.Internals
+	-optdep--exclude-module=Trace.Hpc.Mix \
+	-optdep--exclude-module=Trace.Hpc.Tix \
+	-optdep--exclude-module=Trace.Hpc.Util
 
 PACKAGE_CABAL =
 PACKAGE_HPC   =