[project @ 2001-05-25 10:50:27 by simonmar]

Link with HStext_cbits in case we need regex (bug from Lennart).

*** MAYBE MERGE ***

diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index 4684f98..0ef7ccb 100644 (file)
--- a/mk/bootstrap.mk
+++ b/mk/bootstrap.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: bootstrap.mk,v 1.9 2001/05/22 11:29:04 simonmar Exp $
+# $Id: bootstrap.mk,v 1.10 2001/05/25 10:50:27 simonmar Exp $
 #
 # Makefile rules for booting from .hc files without a driver.
 #
@@ -71,6 +71,7 @@ HC_BOOT_LD_OPTS =                             \
    -L$(FPTOOLS_TOP_ABS)/hslibs/util            \
    -L$(FPTOOLS_TOP_ABS)/hslibs/util/cbits      \
    -L$(FPTOOLS_TOP_ABS)/hslibs/text            \
+   -L$(FPTOOLS_TOP_ABS)/hslibs/text/cbits      \
    -u "PrelBase_Izh_static_info"               \
    -u "PrelBase_Czh_static_info"               \
    -u "PrelFloat_Fzh_static_info"              \
@@ -104,7 +105,7 @@ HC_BOOT_LD_OPTS =                           \
    -u "PrelMain_mainIO_closure"                        \
    -u "__init_PrelMain"
 
-HC_BOOT_LIBS = -lHStext -lHSutil -lHSposix -lHSposix_cbits -lHSconcurrent -lHSlang -lHSlang_cbits -lHSstd -lHSstd_cbits -lHSrts -lgmp $(EXTRA_HC_BOOT_LIBS)
+HC_BOOT_LIBS = -lHStext -lHStext_cbits -lHSutil -lHSposix -lHSposix_cbits -lHSconcurrent -lHSlang -lHSlang_cbits -lHSstd -lHSstd_cbits -lHSrts -lgmp $(EXTRA_HC_BOOT_LIBS)
 
 ifeq "$(GhcLibsWithReadline)" "YES"
 HC_BOOT_LIBS += $(patsubst %, -l%, $(LibsReadline))