[project @ 2000-03-22 12:01:57 by rrt]

[ghc-hetmet.git] / ghc / lib / std / Makefile

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 853c599..44c04ed 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -47,13 +47,6 @@ ifneq "$(way)" ""
 SRC_HC_OPTS += -hisuf $(way_)hi
 endif
 
-# HWL: for debugging GranSim generate .hc and .s files
-SRC_HC_OPTS += -keep-hc-files-too -keep-s-files-too
-# # HWL: why isn't that on by default !!????????????
-# ifeq "$(way)" "mg"
-# SRC_HC_OPTS += -gransim
-# endif
-
 # per-module flags
 PrelArrExtra_HC_OPTS     += -monly-2-regs
 
@@ -62,7 +55,7 @@ PrelArrExtra_HC_OPTS     += -monly-2-regs
 PrelNumExtra_HC_OPTS     += -H24m -K2m
 
 PrelPack_HC_OPTS        += -K4m
-PrelBase_HC_OPTS         += -H32m -K32m
+PrelBase_HC_OPTS         += -H12m
 PrelRead_HC_OPTS         += -H20m
 PrelTup_HC_OPTS          += -H12m -K2m
 PrelNum_HC_OPTS                 += -H12m -K4m
@@ -91,7 +84,7 @@ DLL_NAME = HSprel.dll
 DLL_DESCRIPTION="GHC-compiled Haskell Prelude"
 DLL_IMPLIB_NAME = libHS_imp.a
 SRC_BLD_DLL_OPTS += --export-all --output-def=HSprel.def DllVersionInfo.o
-SRC_BLD_DLL_OPTS += -lwinmm -lHSrts_imp -lHScbits_imp -lgmp -L. -L../../rts/gmp -L../../rts -Lcbits
+SRC_BLD_DLL_OPTS += -lwinmm -lHSrts_imp -lHS_cbits_imp -lgmp -L. -L../../rts/gmp -L../../rts -Lcbits
 
 ifeq "$(way)" "dll"
 HS_SRCS := $(filter-out PrelMain.lhs, $(HS_SRCS))
@@ -116,12 +109,15 @@ CLEAN_FILES += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 # 
 # So, we copy out PrelMain.lhs to ".." and build it there &
 # copy the gen'ed object file back in again.
+#
+# Note the patsubst hack (see fptools/mk/target.mk and search for
+# odir for details)
 # 
 ifeq "$(way)" "dll"
 PrelMain.dll_o : PrelMain.lhs
        $(RM) ../PrelMain.lhs
        $(CP) PrelMain.lhs ../
-       $(MAKE) -C .. PrelMain.dll_o way=dll HC_OPTS="$(filter-out -fcompiling-prelude, $(HC_OPTS))"
+       $(MAKE) -C .. PrelMain.dll_o way=dll HC=std/$(GHC_INPLACE) HC_OPTS="$(filter-out -fcompiling-prelude -split-objs, $(patsubst -odir,,$(HC_OPTS)))"
        $(MV) ../PrelMain.dll_o .
        $(RM) ../PrelMain.lhs ../PrelMain.dll_hi
 endif