Follow Cabal changes

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

diff --git a/compat/compat.mk b/compat/compat.mk
index 9730bdf..c2bfeb1 100644 (file)
--- a/compat/compat.mk
+++ b/compat/compat.mk
@@ -15,9 +15,7 @@ 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
-endif
 
 ifeq "$(ghc_ge_607)" "YES"
 SRC_HC_OPTS += -package directory
@@ -25,10 +23,6 @@ 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
@@ -42,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 \
@@ -51,14 +43,16 @@ SRC_MKDEPENDHS_OPTS += \
        -optdep--exclude-module=Distribution.GetOpt \
        -optdep--exclude-module=Distribution.InstalledPackageInfo \
        -optdep--exclude-module=Distribution.License \
+       -optdep--exclude-module=Distribution.ModuleName \
        -optdep--exclude-module=Distribution.Package \
        -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