ifneq "$(findstring $(stage), 2 3)" ""
bootstrapped = YES
else
-bootstrapped = $(shell if (test $(GhcCanonVersion) -eq $(ProjectVersionInt) -a $(GhcPatchLevel) -eq $(ProjectPatchLevel)); then echo YES; else echo NO; fi)
+bootstrapped = NO
endif
endif
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
basicTypes/SrcLoc_HC_OPTS = -funbox-strict-fields
-ifeq "$(bootstrapped)" "YES"
-utils/Binary_HC_OPTS = -funbox-strict-fields
-endif
-
# We always optimise some low-level modules, otherwise performance of
# a non-optimised compiler is severely affected.
main/BinIface_HC_OPTS += -O
-utils/Binary_HC_OPTS += -O
+utils/Binary_HC_OPTS += -O -funbox-strict-fields
utils/FastMutInt_HC_OPTS += -O
utils/Encoding_HC_OPTS += -O
-utils/StringBuffer_HC_OPTS += -O
-utils/FastString_HC_OPTS += -O
+utils/StringBuffer_HC_OPTS += -O -funbox-strict-fields
+utils/FastString_HC_OPTS += -O -funbox-strict-fields
# ---- Profiling ----
#simplCore/Simplify_HC_OPTS = -auto-all