X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fbootstrap.mk;h=9b8a79a5af541d97c03e84cfde22a20a0184e654;hb=27d13cb655147c28eeed0f06cac6fc40c5d778aa;hp=b1577c56194950579589462a6c6a049c951f0745;hpb=e7991146b019a75aab75d4d9ee4357134c01d979;p=ghc-hetmet.git

diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index b1577c5..9b8a79a 100644
--- a/mk/bootstrap.mk
+++ b/mk/bootstrap.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: bootstrap.mk,v 1.6 2001/03/27 12:59:18 simonmar Exp $
+# $Id: bootstrap.mk,v 1.12 2001/07/23 22:33:53 ken Exp $
 #
 # Makefile rules for booting from .hc files without a driver.
 #
@@ -50,7 +50,7 @@ endif
 
 PLATFORM_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) 
 
-HC_BOOT_CC_OPTS = $(PLATFORM_HC_BOOT_CC_OPTS) -D__GLASGOW_HASKELL__=411 $(CC_OPTS)
+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)/ghc/lib/std/cbits -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
 
@@ -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"
@@ -116,6 +118,17 @@ 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/'`
 
@@ -124,3 +137,5 @@ endif
 
 %.o : %.s
 	$(CC) -c -o $@ $<
+
+endif