[project @ 2002-08-09 21:28:09 by sof]

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

diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index cbd6041..25cee8b 100644 (file)
--- a/mk/bootstrap.mk
+++ b/mk/bootstrap.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: bootstrap.mk,v 1.17 2001/09/25 18:08:48 ken Exp $
+# $Id: bootstrap.mk,v 1.20 2002/08/09 21:28:10 sof Exp $
 #
 # Makefile rules for booting from .hc files without a driver.
 #
@@ -61,16 +61,23 @@ 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)/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
+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
 
 # -----------------------------------------------------------------------------
 # Linking: we have to give all the libraries explicitly.
 
+ifeq "$(LeadingUnderscore)" "YES"
+UNDERSCORE=_
+else
+UNDERSCORE=
+endif
+
+
 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)/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      \
@@ -81,40 +88,40 @@ HC_BOOT_LD_OPTS =                           \
    -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"              \
-   -u "PrelFloat_Dzh_static_info"              \
-   -u "PrelPtr_Ptr_static_info"                        \
-   -u "PrelWord_Wzh_static_info"               \
-   -u "PrelInt_I8zh_static_info"               \
-   -u "PrelInt_I16zh_static_info"              \
-   -u "PrelInt_I32zh_static_info"              \
-   -u "PrelInt_I64zh_static_info"              \
-   -u "PrelWord_W8zh_static_info"              \
-   -u "PrelWord_W16zh_static_info"             \
-   -u "PrelWord_W32zh_static_info"             \
-   -u "PrelWord_W64zh_static_info"             \
-   -u "PrelStable_StablePtr_static_info"       \
-   -u "PrelBase_Izh_con_info"                  \
-   -u "PrelBase_Czh_con_info"                  \
-   -u "PrelFloat_Fzh_con_info"                 \
-   -u "PrelFloat_Dzh_con_info"                 \
-   -u "PrelPtr_Ptr_con_info"                   \
-   -u "PrelStable_StablePtr_con_info"          \
-   -u "PrelBase_False_closure"                 \
-   -u "PrelBase_True_closure"                  \
-   -u "PrelPack_unpackCString_closure"         \
-   -u "PrelIOBase_stackOverflow_closure"       \
-   -u "PrelIOBase_heapOverflow_closure"                \
-   -u "PrelIOBase_NonTermination_closure"      \
-   -u "PrelIOBase_BlockedOnDeadMVar_closure"   \
-   -u "PrelWeak_runFinalizzerBatch_closure"    \
-   -u "__stginit_Prelude"                      \
-   -u "PrelMain_mainIO_closure"                        \
-   -u "__stginit_PrelMain"
-
-HC_BOOT_LIBS = -lHStext -lHStext_cbits -lHSutil -lHSposix -lHSposix_cbits -lHSconcurrent -lHSlang -lHSlang_cbits -lHSstd -lHSstd_cbits -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS)
+   -u "$(UNDERSCORE)PrelBase_Izh_static_info"          \
+   -u "$(UNDERSCORE)PrelBase_Czh_static_info"          \
+   -u "$(UNDERSCORE)PrelFloat_Fzh_static_info"         \
+   -u "$(UNDERSCORE)PrelFloat_Dzh_static_info"         \
+   -u "$(UNDERSCORE)PrelPtr_Ptr_static_info"           \
+   -u "$(UNDERSCORE)PrelWord_Wzh_static_info"          \
+   -u "$(UNDERSCORE)PrelInt_I8zh_static_info"          \
+   -u "$(UNDERSCORE)PrelInt_I16zh_static_info"         \
+   -u "$(UNDERSCORE)PrelInt_I32zh_static_info"         \
+   -u "$(UNDERSCORE)PrelInt_I64zh_static_info"         \
+   -u "$(UNDERSCORE)PrelWord_W8zh_static_info"         \
+   -u "$(UNDERSCORE)PrelWord_W16zh_static_info"                \
+   -u "$(UNDERSCORE)PrelWord_W32zh_static_info"                \
+   -u "$(UNDERSCORE)PrelWord_W64zh_static_info"                \
+   -u "$(UNDERSCORE)PrelStable_StablePtr_static_info"  \
+   -u "$(UNDERSCORE)PrelBase_Izh_con_info"             \
+   -u "$(UNDERSCORE)PrelBase_Czh_con_info"             \
+   -u "$(UNDERSCORE)PrelFloat_Fzh_con_info"            \
+   -u "$(UNDERSCORE)PrelFloat_Dzh_con_info"            \
+   -u "$(UNDERSCORE)PrelPtr_Ptr_con_info"              \
+   -u "$(UNDERSCORE)PrelStable_StablePtr_con_info"     \
+   -u "$(UNDERSCORE)PrelBase_False_closure"            \
+   -u "$(UNDERSCORE)PrelBase_True_closure"             \
+   -u "$(UNDERSCORE)PrelPack_unpackCString_closure"    \
+   -u "$(UNDERSCORE)PrelIOBase_stackOverflow_closure"  \
+   -u "$(UNDERSCORE)PrelIOBase_heapOverflow_closure"   \
+   -u "$(UNDERSCORE)PrelIOBase_NonTermination_closure" \
+   -u "$(UNDERSCORE)PrelIOBase_BlockedOnDeadMVar_closure"      \
+   -u "$(UNDERSCORE)PrelWeak_runFinalizzerBatch_closure"       \
+   -u "$(UNDERSCORE)__stginit_Prelude"                         \
+   -u "$(UNDERSCORE)PrelMain_mainIO_closure"                   \
+   -u "$(UNDERSCORE)__stginit_PrelMain"
+
+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)
 
 ifeq "$(GhcLibsWithReadline)" "YES"
 HC_BOOT_LIBS += $(patsubst %, -l%, $(LibsReadline))
@@ -142,7 +149,7 @@ else
        $(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
-       $(FPTOOLS_TOP)/$(GHC_MANGLER_DIR)/$(GHC_MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS)))
+       $(GHC_MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS)))
 
 %.o : %.s
        $(CC) -c -o $@ $<