[project @ 1999-10-29 13:50:16 by sof]

[ghc-hetmet.git] / ghc / rts / Makefile

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 44da0b7..1de4b8b 100644 (file)
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.9 1999/05/04 10:19:17 sof Exp $
+# $Id: Makefile,v 1.15 1999/10/29 13:50:16 sof Exp $
 
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
@@ -25,6 +25,12 @@ SRCS_RTS_C  = $(wildcard *.c) $(wildcard hooks/*.c) $(filter-out gum/SysMan.c,$(
 SRCS_RTS_S  = $(wildcard *.S)
 SRCS_RTS_HC = $(wildcard *.hc)
 
+ifneq "$(way)" "dll"
+SRCS_RTS_C  := $(filter-out RtsDllMain.c, $(SRCS_RTS_C))
+else
+SRCS_RTS_C  := $(filter-out Main.c, $(SRCS_RTS_C))
+endif
+
 #-----------------------------------------------------------------------------
 # creating and installing libHSrts.a (in its many flavors)
 #
@@ -59,12 +65,13 @@ SRC_CC_OPTS = $(GhcRtsCcOpts)
 ifneq "$(way)" "dll"
 SRC_HC_OPTS += -static
 endif
+# SRC_HC_OPTS += -optc-fPIC
 
 ifeq "$(way)" "mp"
 SRC_HC_OPTS += -I$$PVM_ROOT/include
 endif
 
-C_SRCS = $(SRCS_RTS_C) $(SRCS_RTS_HC) # $(SRCS_RTS_S)???
+C_SRCS = $(SRCS_RTS_C) $(SRCS_RTS_HC) $(SRCS_RTS_S)
 
 SRC_MKDEPENDC_OPTS += -I. -I../includes
 
@@ -77,7 +84,8 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes
 # ../driver/ghc (a better C compiler :-) to compile the
 # different RTS pieces
 #
-CC=$(HC) $(HC_OPTS) $($*_HC_OPTS)
+CC=$(GHC) $(HC_OPTS) $($*_HC_OPTS)
+HC=$(GHC)
 
 # prevent this value from leaking into the GMP makefile
 unexport CC
@@ -86,16 +94,24 @@ unexport CC
 #
 #  Building DLLs is only supported on mingw32 at the moment.
 # 
-ifeq "$(way)" "dll"
 DLL_NAME          = HSrts.dll
-SRC_BLD_DLL_OPTS += --def HSrts.def -lwinmm -lHS_imp -lgmp -L. -Lgmp
+ifeq "$(way)" "dll"
+DLL_IMPLIB_NAME   = libHSrts_imp.a
+SRC_BLD_DLL_OPTS += --def HSrts.def -lwinmm -lHS_imp_stub -lgmp -L. -Lgmp
 
-LIBOBJS := $(filter-out Main.$(way_)o, $(LIBOBJS))
+#
+# Need an import library containing the symbols the RTS uses from the Prelude.
+# So, to avoid bootstrapping trouble, we build one containing just the syms
+# we need. Weirdly named to avoid clashing later on when compiling the contents
+# of ghc/lib/..
+#
+# Note: if you do change the name of the Prelude DLL, the "--dllname <nm>.dll"
+# below will need to be updated as well.
 
-$(DLL_NAME) :: libHS_imp.a
+$(DLL_NAME) :: libHS_imp_stub.a
 
-libHS_imp.a :
-       dlltool --output-lib libHS_imp.a --def HSprel.def --dllname HSprel.dll
+libHS_imp_stub.a :
+       dlltool --output-lib libHS_imp_stub.a --def HSprel.def --dllname HSprel.dll
 
 # It's not included in the DLL, but we need to compile it up separately.
 all :: Main.dll_o
@@ -156,6 +172,11 @@ endif
 # Just libHSrts is installed uniformly across ways
 #
 INSTALL_LIBS += $(LIBRARY)
+ifeq "$(EnableWin32DLLs)" "YES"
+INSTALL_PROGS += $(DLL_NAME) gmp/gmp.dll
+INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBRARY))
+INSTALL_LIBS += gmp/libgmp_imp.a Main.dll_o
+endif
 
 include $(TOP)/mk/target.mk