[project @ 2001-06-11 16:49:23 by sewardj]

[ghc-hetmet.git] / mk / bootstrap.mk

diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index 30adf94..e712ed5 100644 (file)
--- a/mk/bootstrap.mk
+++ b/mk/bootstrap.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: bootstrap.mk,v 1.7 2001/04/24 15:06:32 simonmar Exp $
+# $Id: bootstrap.mk,v 1.11 2001/05/25 10:53:59 simonmar Exp $
 #
 # Makefile rules for booting from .hc files without a driver.
 #
@@ -59,6 +59,7 @@ SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/ghc/includes -I$(FPTOOLS_TOP_ABS)/ghc/lib/st
 
 HC_BOOT_LD_OPTS =                              \
    -L$(FPTOOLS_TOP_ABS)/ghc/rts                        \
+   -L$(FPTOOLS_TOP_ABS)/ghc/rts/gmp            \
    -L$(FPTOOLS_TOP_ABS)/ghc/lib/std            \
    -L$(FPTOOLS_TOP_ABS)/ghc/lib/std/cbits      \
    -L$(FPTOOLS_TOP_ABS)/hslibs/lang            \
@@ -70,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"              \
@@ -103,10 +105,10 @@ 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 -lm $(EXTRA_HC_BOOT_LIBS)
 
 ifeq "$(GhcLibsWithReadline)" "YES"
-HC_BOOT_LIBS += $(LibsReadline)
+HC_BOOT_LIBS += $(patsubst %, -l%, $(LibsReadline))
 endif
 
 ifeq "$(HaveLibDL)" "YES"