X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compat%2Fcompat.mk;h=9730bdf5176b0897eec189b35265c4a4d8cdabee;hb=2b32fbd087d2439238ef225f05f50822d04a6060;hp=48b2bea76ddbb3125e374a746810fe5c5740d4a1;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/compat/compat.mk b/compat/compat.mk
index 48b2bea..9730bdf 100644
--- a/compat/compat.mk
+++ b/compat/compat.mk
@@ -6,6 +6,10 @@
 # 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
@@ -15,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
@@ -41,4 +55,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
+