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

When building way=u, merge cbits/*.o into ./libHS_cbits.u_o, for Hugs.

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 5b72cd0..96400f9 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -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
 #