From: Ian Lynagh <igloo@earth.li>
Date: Thu, 26 Jul 2007 18:16:22 +0000 (+0000)
Subject: Fix building the HEAD with itself
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=04d444716b2e5415fb8f13771e49f1192ef8c8f8

Fix building the HEAD with itself
---

diff --git a/compat/Makefile b/compat/Makefile
index 31d998e..76566a8 100644
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -54,12 +54,19 @@ SRC_CC_OPTS += -D__GHC_PATCHLEVEL__=$(GhcPatchLevel)
 EXCLUDED_SRCS += System/FilePath/Internal.hs
 
 ifeq "$(ghc_ge_603)" "YES"
+ifneq "$(ghc_ge_607)" "YES"
 # GHC 6.3+ has Cabal, but we're replacing it:
 SRC_HC_OPTS += -ignore-package Cabal
 
 # only GHC 6.3+ has -ignore-package
 SRC_HC_OPTS += -ignore-package filepath
 endif
+endif
+
+ifeq "$(ghc_ge_607)" "YES"
+SRC_HC_OPTS += -package directory
+SRC_HC_OPTS += -package pretty
+endif
 
 # Some explicit dependencies, needed because ghc -M can't discover the
 # true dependencies of these stub files.
diff --git a/compat/compat.mk b/compat/compat.mk
index 9c41e0a..66b8299 100644
--- a/compat/compat.mk
+++ b/compat/compat.mk
@@ -19,6 +19,11 @@ 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
+endif
+
 # And similarly for when booting from .hc files:
 HC_BOOT_LD_OPTS += -L$(GHC_COMPAT_DIR)
 HC_BOOT_LIBS += -lghccompat