X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fbootstrap.mk;h=aef691dd1d02a5f7d440f46ad94200be009a02a3;hb=13aca089b924f6ac3cd598e17b471ab38a1e3e78;hp=930d4bee56d24c59dfea946d49571e0d48d2dc1a;hpb=bdc74564dfbae62c9f3d1766872634edf2cc4ccc;p=ghc-hetmet.git

diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index 930d4be..aef691d 100644
--- a/mk/bootstrap.mk
+++ b/mk/bootstrap.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: bootstrap.mk,v 1.22 2002/08/14 14:06:25 sof Exp $
+# $Id: bootstrap.mk,v 1.30 2004/02/04 10:00:43 simonmar Exp $
 #
 # Makefile rules for booting from .hc files without a driver.
 #
@@ -58,14 +58,21 @@ 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) 
 
 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)/hslibs/lang/cbits -I$(FPTOOLS_TOP_ABS)/hslibs/posix/cbits -I$(FPTOOLS_TOP_ABS)/hslibs/util/cbits -I$(FPTOOLS_TOP_ABS)/hslibs/text/cbits -I$(FPTOOLS_TOP_ABS)/hslibs/hssource/cbits
+SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/ghc/includes -I$(FPTOOLS_TOP_ABS)/libraries/base/include -I$(FPTOOLS_TOP_ABS)/libraries/unix/include -I$(FPTOOLS_TOP_ABS)/libraries/parsec/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,17 +92,18 @@ 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)/hslibs/lang		\
-   -L$(FPTOOLS_TOP_ABS)/hslibs/lang/cbits	\
-   -L$(FPTOOLS_TOP_ABS)/hslibs/concurrent	\
-   -L$(FPTOOLS_TOP_ABS)/hslibs/concurrent/cbits	\
-   -L$(FPTOOLS_TOP_ABS)/hslibs/posix		\
-   -L$(FPTOOLS_TOP_ABS)/hslibs/posix/cbits	\
-   -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	\
+   -L$(FPTOOLS_TOP_ABS)/libraries/haskell98
+
+ifeq "$(GhcWithInterpreter)" "YES"
+HC_BOOT_LD_OPTS += \
+   -L$(FPTOOLS_TOP_ABS)/libraries/template-haskell	\
+   -L$(FPTOOLS_TOP_ABS)/libraries/readline	\
+   -L$(FPTOOLS_TOP_ABS)/libraries/parsec        \
+   -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" \
@@ -128,7 +136,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 -lHStemplate-haskell -lHSunix -lHSunix_cbits
+endif
+
+HC_BOOT_LIBS += -lHShaskell98 -lHSbase -lHSbase_cbits -lHSparsec -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS)
 
 ifeq "$(GhcLibsWithReadline)" "YES"
 HC_BOOT_LIBS += $(patsubst %, -l%, $(LibsReadline))
@@ -137,28 +152,3 @@ endif
 ifeq "$(HaveLibDL)" "YES"
 HC_BOOT_LIBS += -ldl
 endif
-
-# -----------------------------------------------------------------------------
-# suffix rules for building a .o from a .hc file.
-
-ifeq "$(BootingFromUnregisterisedHc)" "YES"
-
-# without mangling
-
-%.o : %.hc
-	$(CC) -x c $< -o $@ -c -O $(HC_BOOT_CC_OPTS) -I.  `echo $(patsubst -monly-%-regs, -DSTOLEN_X86_REGS=%, $(filter -monly-%-regs, $($*_HC_OPTS))) | sed 's/^$$/-DSTOLEN_X86_REGS=4/'`
-
-else
-
-# with mangling
-
-%.raw_s : %.hc
-	$(CC) -x c $< -o $@ -S -O $(HC_BOOT_CC_OPTS) -I.  `echo $(patsubst -monly-%-regs, -DSTOLEN_X86_REGS=%, $(filter -monly-%-regs, $($*_HC_OPTS))) | sed 's/^$$/-DSTOLEN_X86_REGS=4/'`
-
-%.s : %.raw_s
-	$(GHC_MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS)))
-
-%.o : %.s
-	$(CC) -c -o $@ $<
-
-endif