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

diff --git a/compat/compat.mk b/compat/compat.mk
index 9c41e0a..00a3c9f 100644
--- a/compat/compat.mk
+++ b/compat/compat.mk
@@ -14,9 +14,10 @@ SRC_HC_OPTS += -DUSING_COMPAT
 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,23 +33,7 @@ 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 \
-	-optdep--exclude-module=Distribution.Extension \
-	-optdep--exclude-module=Distribution.GetOpt \
-	-optdep--exclude-module=Distribution.InstalledPackageInfo \
-	-optdep--exclude-module=Distribution.License \
-	-optdep--exclude-module=Distribution.Package \
-	-optdep--exclude-module=Distribution.ParseUtils \
-	-optdep--exclude-module=Distribution.Compiler \
-	-optdep--exclude-module=Distribution.Version \
-	-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