[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 153b9fb..96400f9 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -28,13 +28,13 @@ MKDEPENDHS = $(GHC_INPLACE)
 LIBRARY = libHS$(_way).a
 LIBOBJS = $(HS_OBJS)
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-LIBOBJS = $(filter-out PrelHugs.o,$(HS_OBJS))
+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
@@ -120,6 +120,20 @@ PrelMain.dll_o : PrelMain.lhs
        $(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
 #