[project @ 2000-04-10 16:49:15 by sewardj]

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

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 44c04ed..96400f9 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -27,11 +27,14 @@ MKDEPENDHS = $(GHC_INPLACE)
 
 LIBRARY = libHS$(_way).a
 LIBOBJS = $(HS_OBJS)
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+LIBOBJS = $(filter-out PrelHugs.$(way_)o,$(HS_OBJS))
+endif
 
 #-----------------------------------------------------------------------------
 #      Setting the GHC compile options
 
-SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts) -fcompiling-prelude
+SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts)
 ifneq "$(way)" "dll"
 SRC_HC_OPTS += -static
 endif
@@ -47,9 +50,6 @@ ifneq "$(way)" ""
 SRC_HC_OPTS += -hisuf $(way_)hi
 endif
 
-# per-module flags
-PrelArrExtra_HC_OPTS     += -monly-2-regs
-
 # Far too much heap is needed to compile PrelNumExtra with -O at the
 # moment, but there you go..
 PrelNumExtra_HC_OPTS     += -H24m -K2m
@@ -87,7 +87,7 @@ SRC_BLD_DLL_OPTS += --export-all --output-def=HSprel.def DllVersionInfo.o
 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))
+HS_SRCS := $(filter-out PrelMain.lhs PrelHugs.lhs, $(HS_SRCS))
 endif
 
 # PrelMain.dll_o isn't to be included in the final .a, 
@@ -109,19 +109,31 @@ 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"
+SplitObjs = NO
 PrelMain.dll_o : PrelMain.lhs
        $(RM) ../PrelMain.lhs
        $(CP) PrelMain.lhs ../
-       $(MAKE) -C .. PrelMain.dll_o way=dll HC=std/$(GHC_INPLACE) HC_OPTS="$(filter-out -fcompiling-prelude -split-objs, $(patsubst -odir,,$(HC_OPTS)))"
+       $(MAKE) -C .. PrelMain.dll_o way=dll HC=std/$(GHC_INPLACE) HC_OPTS="$(filter-out -fcompiling-prelude, $(HC_OPTS))"
        $(MV) ../PrelMain.dll_o .
        $(RM) ../PrelMain.lhs ../PrelMain.dll_hi
 endif
 
+
+#
+# If we're building the unregisterised way, it may well be for Hugs.
+# In that case, remember to bind the cbits objects into a single file
+# which hugs can load as an auxiliary object file when loading the Prelude.
+#
+ifeq "$(way)" "u"
+all :: libHS_cbits.u_o
+CLEAN_FILES += libHS_cbits.u_o
+libHS_cbits.u_o:
+       $(RM) libHS_cbits.u_o
+       ld -r -o libHS_cbits.u_o cbits/*.o
+endif
+
 #-----------------------------------------------------------------------------
 #      Installation; need to install .hi files as well as libraries
 #