X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compat%2Fcompat.mk;h=efd35b66de490a24ab323667da062390a148d2b8;hb=b0ca990457eaf7991e72b13d0040d937b5759b36;hp=9c41e0a42c9d7744c3ff9a225d99d9f64825429c;hpb=1a0c116d27a9032611c05efe2b0b07e1eae35dce;p=ghc-hetmet.git

diff --git a/compat/compat.mk b/compat/compat.mk
index 9c41e0a..efd35b6 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 \
@@ -45,10 +47,11 @@ SRC_MKDEPENDHS_OPTS += \
 	-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