projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
466ad9a
)
add dependency on regex-compat
author
Simon Marlow
<simonmar@microsoft.com>
Fri, 25 Aug 2006 09:32:26 +0000
(09:32 +0000)
committer
Simon Marlow
<simonmar@microsoft.com>
Fri, 25 Aug 2006 09:32:26 +0000
(09:32 +0000)
compiler/Makefile
patch
|
blob
|
history
diff --git
a/compiler/Makefile
b/compiler/Makefile
index
e82adc8
..
2a014b9
100644
(file)
--- 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