[project @ 2003-07-30 09:21:12 by wolfgang]

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

diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index e60a21c..55fd6d1 100644 (file)
--- a/mk/bootstrap.mk
+++ b/mk/bootstrap.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: bootstrap.mk,v 1.24 2003/07/24 11:03:07 simonmar Exp $
+# $Id: bootstrap.mk,v 1.26 2003/07/24 13:40:05 simonmar Exp $
 #
 # Makefile rules for booting from .hc files without a driver.
 #
@@ -58,7 +58,10 @@ PLATFORM_HC_BOOT_CC_OPTS += -w
 endif
 
 ifeq "$(BootingFromUnregisterisedHc)" "YES"
-PLATFORM_HC_BOOT_CC_OPTS +=-DNO_REGS -DUSE_MINIINTERPRETER
+PLATFORM_HC_BOOT_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER
+SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER
+# Add these flags to SRC_CC_OPTS too, because they need to be passed to the plain .c
+# files in ghc/rts.
 endif
 
 PLATFORM_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) 
@@ -118,7 +121,7 @@ HC_BOOT_LD_OPTS =                           \
    -u "$(UNDERSCORE)GHCziWeak_runFinalizzerBatch_closure" \
    -u "$(UNDERSCORE)__stginit_Prelude"
 
-HC_BOOT_LIBS = -lHStext -lHStext_cbits -lHSutil -lHSposix -lHSposix_cbits -lHSconcurrent -lHSlang -lHSlang_cbits -lHShaskell98 -lHSbase -lHSbase_cbits -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS)
+HC_BOOT_LIBS = -lHShaskell98 -lHSbase -lHSbase_cbits -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS)
 
 ifeq "$(GhcLibsWithReadline)" "YES"
 HC_BOOT_LIBS += $(patsubst %, -l%, $(LibsReadline))