X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compat%2Fcompat.mk;h=9730bdf5176b0897eec189b35265c4a4d8cdabee;hb=7f2909e06884a04199131407c12ba179d5886f46;hp=a9eadb8009604e91a8dbfa9b6c886c0158cf6990;hpb=272d9683a9eabfd8e10f689b2a6cfb19b9071722;p=ghc-hetmet.git

diff --git a/compat/compat.mk b/compat/compat.mk
index a9eadb8..9730bdf 100644
--- a/compat/compat.mk
+++ b/compat/compat.mk
@@ -19,6 +19,16 @@ ifeq "$(ghc_ge_603)" "YES"
 SRC_HC_OPTS += -ignore-package Cabal
 endif
 
+ifeq "$(ghc_ge_607)" "YES"
+SRC_HC_OPTS += -package directory
+SRC_HC_OPTS += -package pretty
+SRC_HC_OPTS += -package containers
+endif
+
+ifeq "$(ghc_ge_603)" "NO"
+SRC_HC_OPTS += -package unix
+endif
+
 # And similarly for when booting from .hc files:
 HC_BOOT_LD_OPTS += -L$(GHC_COMPAT_DIR)
 HC_BOOT_LIBS += -lghccompat
@@ -50,15 +60,16 @@ SRC_MKDEPENDHS_OPTS += \
 	-optdep--exclude-module=System.FilePath.Windows \
 	-optdep--exclude-module=System.Directory.Internals \
 	-optdep--exclude-module=Trace.Hpc.Mix \
-	-optdep--exclude-module=Trace.Hpc.Util \
-	-optdep--exclude-module=Trace.Hpc.Tix 
-
+	-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