X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fbootstrap.mk;h=69c7411cb7c14737cdce00cf612ff8052841ac25;hb=7ca6e18319483cd198c6d74dbfef8b7de734ed98;hp=e60a21c2f8199278e2a1754a0ba53dc9f2c8f957;hpb=8e57a9c2bc401b55ed154c587d0bedae58be001b;p=ghc-hetmet.git

diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index e60a21c..69c7411 100644
--- 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.27 2003/09/02 10:23:30 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) 
@@ -67,6 +70,10 @@ HC_BOOT_CC_OPTS = $(PLATFORM_HC_BOOT_CC_OPTS) $(PLATFORM_CC_OPTS) $(CC_OPTS)
 
 SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/ghc/includes -I$(FPTOOLS_TOP_ABS)/libraries/base/include -I$(FPTOOLS_TOP_ABS)/libraries/unix/include
 
+ifeq "$(GhcWithInterpreter)" "YES"
+SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/libraries/readline/include
+endif
+
 # -----------------------------------------------------------------------------
 # Linking: we have to give all the libraries explicitly.
 
@@ -85,7 +92,17 @@ HC_BOOT_LD_OPTS =				\
    $(DASH_L_GHC_RTS_GMP_DIR)                    \
    -L$(FPTOOLS_TOP_ABS)/libraries/base		\
    -L$(FPTOOLS_TOP_ABS)/libraries/base/cbits	\
-   -L$(FPTOOLS_TOP_ABS)/libraries/haskell98	\
+   -L$(FPTOOLS_TOP_ABS)/libraries/haskell98
+
+ifeq "$(GhcWithInterpreter)" "YES"
+HC_BOOT_LD_OPTS += \
+   -L$(FPTOOLS_TOP_ABS)/libraries/haskell-src	\
+   -L$(FPTOOLS_TOP_ABS)/libraries/readline	\
+   -L$(FPTOOLS_TOP_ABS)/libraries/unix          \
+   -L$(FPTOOLS_TOP_ABS)/libraries/unix/cbits
+endif
+
+HC_BOOT_LD_OPTS += \
    -u "$(UNDERSCORE)GHCziBase_Izh_static_info" \
    -u "$(UNDERSCORE)GHCziBase_Czh_static_info" \
    -u "$(UNDERSCORE)GHCziFloat_Fzh_static_info" \
@@ -118,7 +135,14 @@ 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 =
+
+ifeq "$(GhcWithInterpreter)" "YES"
+HC_BOOT_LIBS += -lHSreadline -lHShaskell-src -lHSunix -lHSunix_cbits
+endif
+
+HC_BOOT_LIBS += -lHShaskell98 -lHSbase -lHSbase_cbits -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS)
 
 ifeq "$(GhcLibsWithReadline)" "YES"
 HC_BOOT_LIBS += $(patsubst %, -l%, $(LibsReadline))