[project @ 2001-06-11 13:39:16 by simonpj]

Changes to build HSstd1.o and HSstd2.o for GHCi in lib/std

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 66f4b15..b8815d5 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -34,9 +34,6 @@ endif
 
 HSLIB = std
 
-# we don't want PrelMain in the GHCi library.
-GHCI_LIBOBJS = $(filter-out PrelMain.$(way_)o,$(HS_OBJS))
-
 BOOT_SRCS += PrelPrimopWrappers.hs
 
 #-----------------------------------------------------------------------------
@@ -99,6 +96,35 @@ endif
 
 CLEAN_FILES += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 
+
+#-----------------------------------------------------------------------------
+#      Building the library for GHCi
+#
+# The procedure differs from that in fptools/mk/target.mk in two ways:
+#  (a) we don't want PrelMain in the GHCi std library
+#  (b) on Win32 we must split it into two, because a single .o file can't
+#      
+
+# we don't want PrelMain in the GHCi library.
+GHCI_LIBOBJS = $(filter-out PrelMain.$(way_)o,$(HS_OBJS))
+
+
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+#              Standard rule
+$(GHCI_LIBRARY) :: $(GHCI_LIBOBJS)
+       ld -r -x -o $@ $(GHCI_LIBOBJS)
+
+else
+#              Rule for Win32 platform
+# Keep HSstd.o as a pseudo-target (I think)
+HSstd.o :: $(GHCI_LIBOBJS)
+       ld -r -x -o HSstd1.o $(filter     Prel%, $(GHCI_LIBOBJS))
+       ld -r -x -o HSstd2.o $(filter-out Prel%, $(GHCI_LIBOBJS))
+endif # TARGETPLATFORM = win32
+
+
+
+
 #-----------------------------------------------------------------------------
 #      Installation; need to install .hi files as well as libraries
 #
@@ -119,6 +145,8 @@ endif
 
 INSTALL_DATAS += PrelGHC.$(way_)hi
 
+
+
 #-----------------------------------------------------------------------------
 # ILX stuff.  PLEASE IGNORE THIS UNLESS YOU'RE WORKING ON GHC.NET
 

diff --git a/mk/target.mk b/mk/target.mk
index c022888..b8c28a6 100644 (file)
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -321,6 +321,20 @@ endif
 
 #----------------------------------------
 #      Building HsLibs libraries.
+#
+# Inputs:
+#   $(HSLIB) is the name of the library to build
+#   $(IS_CBITS_LIB) should be "YES" for a "cbits" library
+#
+# Outputs:
+#   $(LIBRARY)         the name of the library.a
+#   $(GHIC_LIBRARY)    the name of the library.o (for GHCi0
+#   $(LIBOBJS)         objects to put in library
+#   $(STUBOBJS)                more objects to put in library
+# 
+# $(LIBOBJS) is set to $(HS_OBJS) or $(C_OBJS) depending
+# on whether or not it's a "cbits" library.  But you can
+# override this by setting $(LIBOBJS) yourself
 
 ifneq "$(HSLIB)" ""
 
@@ -357,6 +371,15 @@ endif # HSLIB
 
 #----------------------------------------
 #      Libraries/archives
+#
+# Build $(LIBRARY) from $(LIBOJBS)+$(STUBOBJS)
+#
+# Inputs:
+#   $(LIBOBJS)
+#   $(STUBOBJS)
+#
+# Outputs:
+#   Rule to build $(LIBRARY)
 
 ifneq "$(LIBRARY)" ""
 all :: $(LIBRARY)
@@ -397,7 +420,7 @@ ifeq "$(GhcWithInterpreter)" "YES"
 HC_SPLIT_POST = ld -r -x -o $@ $(basename $@)/*.$(way_)o
 else
 HC_SPLIT_POST = touch $@
-endif
+endif # GhcWithInterpreter == YES
 
 SRC_HC_PRE_OPTS  += $(HC_SPLIT_PRE);
 SRC_HC_POST_OPTS += $(HC_SPLIT_POST);
@@ -430,35 +453,54 @@ SRC_HC_POST_OPTS += \
 else
 SRC_HC_POST_OPTS += \
   ld -r -x -o $@.tmp $@; $(MV) $@.tmp $@
-endif
-endif
+endif # SplitObjs
+endif # StripLibraries
 
 $(LIBRARY) :: $(STUBOBJS) $(LIBOBJS)
        $(BUILD_LIB)
-endif
+endif # LIBRARY = ""
 
 #--------------------------------------------------------------
 #      Build dynamically-linkable libraries for GHCi
 #
+# Build $(GHCI_LIBRARY) from $(LIBOBJS)+$(STUBOBJS)
+#
+# Why?  GHCi can only link .o files (at the moment), not .a files
+# so we have to build libFoo.o as well as libFoo.a
+#
+# Furthermore, GHCi currently never loads 
+# profiling libraries (or other non-std ways)
+#
+# Inputs:
+#   $(GHCI_LIBRARY)
+#
+# Outputs:
+#   Rule to build $(GHCI_LIBRARY)
+
 
 ifneq "$(GHCI_LIBRARY)" ""
 ifeq "$(way)" ""
 ifeq "$(GhcWithInterpreter)" "YES"
 
+
+INSTALL_LIBS += $(GHCI_LIBRARY)
+CLEAN_FILES += $(GHCI_LIBRARY)
+
 all :: $(GHCI_LIBRARY)
 
-ifeq "$(GHCI_LIBOBJS)" ""
-GHCI_LIBOBJS = $(LIBOBJS)
+ifneq "$(HSLIB)" "std"
+# An annoying gotcha is that the Prelude is a bit special,
+# for reasons described in ghc/lib/std/Makefile.
+# So we only put in this standard rule for packages other than std
+# The rule for the Prelude is in ghc/lib/std/Makefile
+$(GHCI_LIBRARY) :: $(LIBOBJS)
+       ld -r -x -o $@ $(LIBOBJS) $(STUBOBJS)
 endif
 
-$(GHCI_LIBRARY) :: $(GHCI_LIBOBJS)
-       ld -r -x -o $@ $(GHCI_LIBOBJS) $(STUBOBJS)
+endif # GhcWithInterpreter
+endif # way
+endif # GHCI_LIBRARY
 
-INSTALL_LIBS += $(GHCI_LIBRARY)
-CLEAN_FILES += $(GHCI_LIBRARY)
-endif
-endif
-endif
 
 #----------------------------------------
 #      Building Win32 DLLs