Remove some of the old compat stuff now that we assume GHC 6.4

[ghc-hetmet.git] / compat / compat.mk

diff --git a/compat/compat.mk b/compat/compat.mk
index 82a3792..8101021 100644 (file)
--- 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,13 +47,20 @@ SRC_MKDEPENDHS_OPTS += \
        -optdep--exclude-module=Distribution.ParseUtils \
        -optdep--exclude-module=Distribution.Compiler \
        -optdep--exclude-module=Distribution.Version \
-       -optdep--exclude-module=System.Directory.Internals
+       -optdep--exclude-module=System.FilePath \
+       -optdep--exclude-module=System.FilePath.Posix \
+       -optdep--exclude-module=System.FilePath.Windows \
+       -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