X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compat%2Fcompat.mk;h=474051074d2c55bbd2dd148a031045087736e594;hb=ecc046ac9ca93ae87ff05f7137801d994ad97a05;hp=62057d1f3ea691f17db8a37e54a97caae9aa0d72;hpb=6ac403be68c9ce9bf6ee6b78b9c70c69454dcde5;p=ghc-hetmet.git

diff --git a/compat/compat.mk b/compat/compat.mk
index 62057d1..4740510 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:
@@ -48,13 +52,18 @@ SRC_MKDEPENDHS_OPTS += \
 	-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=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   =
 
 else
 
 PACKAGE_CABAL = -package Cabal
+PACKAGE_HPC   = -package hpc
 
 endif