[project @ 2003-07-24 11:46:01 by simonmar]

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

diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index c9ed5ec..906671b 100644 (file)
--- a/mk/bootstrap.mk
+++ b/mk/bootstrap.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: bootstrap.mk,v 1.23 2003/07/24 10:38:33 simonmar Exp $
+# $Id: bootstrap.mk,v 1.25 2003/07/24 11:46:01 simonmar Exp $
 #
 # Makefile rules for booting from .hc files without a driver.
 #
@@ -118,7 +118,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))
@@ -127,28 +127,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