This goes with the patch for #1839, #1463

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

diff --git a/compat/compat.mk b/compat/compat.mk
index 48b2bea..4740510 100644 (file)
--- a/compat/compat.mk
+++ b/compat/compat.mk
@@ -6,13 +6,21 @@
 # have to deal with variations in the package support of different
 # versions of GHC.
 
+ifneq "$(UseStage1)" "YES"
+
+SRC_HC_OPTS += -DUSING_COMPAT
+
 # Use libghccompat.a:
 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:
@@ -41,4 +49,21 @@ 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=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
+