From: Simon Marlow <simonmar@microsoft.com>
Date: Fri, 25 Aug 2006 09:32:26 +0000 (+0000)
Subject: add dependency on regex-compat
X-Git-Tag: Before_FC_branch_merge~129
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=4cfe37a21c58a8676642bfe5a813839fc33a0167

add dependency on regex-compat
---

diff --git a/compiler/Makefile b/compiler/Makefile
index e82adc8..2a014b9 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -515,6 +515,16 @@ SRC_HC_OPTS += -package Cabal
 PKG_DEPENDS += Cabal
 endif
 
+# We use Text.Regex which is in regex-compat with GHC 6.6+
+ifeq "$(bootstrapped)" "YES"
+SRC_HC_OPTS += -package regex-compat
+PKG_DEPENDS += regex-compat
+else
+ifeq "$(ghc_ge_605)" "YES"
+SRC_HC_OPTS += -package regex-compat
+endif
+endif
+
 ifeq "$(ghc_ge_603)" "YES"
 # Ignore lang, to avoid potential clash with the Generics module if
 # lang happens to be a dependency of some exposed package in the local