X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=fb4206c8be2eae600ee67abf3801a4d14a04a00a;hb=2fe38b5fb0957f9428864afd69ad3ccd82fae3d0;hp=b002bdc2a6260bed5e46c993acae33cd826cfefa;hpb=f65bf7559b3e92607cfcf7a334e9994891dd9c32;p=ghc-hetmet.git

diff --git a/rts/ghc.mk b/rts/ghc.mk
index b002bdc..fb4206c 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -74,9 +74,52 @@ rts/libs.depend : $(GHC_PKG_INPLACE)
 	"$(GHC_PKG_INPLACE)" field rts extra-libraries \
 	  | sed -e 's/^extra-libraries: //' -e 's/\([a-z0-9]*\)[ ]*/-l\1 /g' > $@
 
+
+# ----------------------------------------------------------------------------
+# On Windows, as the RTS and base libraries have recursive imports,
+# 	we have to break the loop with "import libraries".
+# 	These are made from rts/win32/libHS*.def which contain lists of
+# 	all the symbols in those libraries used by the RTS.
+#
+ifneq "$$(findstring dyn, $1)" ""
+ifeq  "$(HOSTPLATFORM)" "i386-unknown-mingw32" 
+
+ALL_RTS_DEF_LIBNAMES 	= base ghc-prim
+ALL_RTS_DEF_LIBS	= \
+	rts/dist/build/win32/libHSbase.dll.a \
+	rts/dist/build/win32/libHSghc-prim.dll.a \
+	rts/dist/build/win32/libHSffi.dll.a 
+
+# -- import libs for the regular Haskell libraries
+define make-importlib-def # args $1 = lib name
+rts/dist/build/win32/libHS$1.def : rts/win32/libHS$1.def
+	cat rts/win32/libHS$1.def \
+		| sed "s/@LibVersion@/$$(libraries/$1_dist-install_VERSION)/" \
+		| sed "s/@ProjectVersion@/$(ProjectVersion)/" \
+		> rts/dist/build/win32/libHS$1.def
+		
+rts/dist/build/win32/libHS$1.dll.a : rts/dist/build/win32/libHS$1.def
+	"$$(DLLTOOL)" 	-d rts/dist/build/win32/libHS$1.def \
+			-l rts/dist/build/win32/libHS$1.dll.a
+endef
+$(foreach lib,$(ALL_RTS_DEF_LIBNAMES),$(eval $(call make-importlib-def,$(lib))))
+
+
+# -- import libs for libffi
+rts/dist/build/win32/libHSffi.def : rts/win32/libHSffi.def
+	cat rts/win32/libHSffi.def \
+		| sed "s/@ProjectVersion@/$(ProjectVersion)/" \
+		> rts/dist/build/win32/libHSffi.def
+		
+rts/dist/build/win32/libHSffi.dll.a : rts/dist/build/win32/libHSffi.def
+	"$(DLLTOOL)" 	-d rts/dist/build/win32/libHSffi.def \
+			-l rts/dist/build/win32/libHSffi.dll.a
+endif
+endif
+
+
 #-----------------------------------------------------------------------------
 # Building one way
-
 define build-rts-way # args: $1 = way
 
 # The per-way CC_OPTS
@@ -95,6 +138,8 @@ endif
 $(call distdir-way-opts,rts,dist,$1)
 $(call c-suffix-rules,rts,dist,$1,YES)
 $(call cmm-suffix-rules,rts,dist,$1)
+$(call hs-suffix-rules-srcdir,rts,dist,$1,$$(dir))
+# hs-suffix-rules-srcdir is needed when BootingFromHc to get the .hc rules
 
 rts_$1_LIB = rts/dist/build/libHSrts$$($1_libsuf)
 
@@ -106,15 +151,23 @@ rts_$1_OBJS = $$(rts_$1_C_OBJS) $$(rts_$1_S_OBJS) $$(rts_$1_CMM_OBJS)
 
 rts_dist_$1_CC_OPTS += -DRtsWay=$$(DQ)rts_$1$$(DQ)
 
+# Making a shared library for the RTS.
 ifneq "$$(findstring dyn, $1)" ""
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend
+	"$$(RM)" $$(RM_OPTS) $$@
+	"$$(rts_dist_HC)" -shared -dynamic -dynload deploy \
+	  -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@
+else
 $$(rts_$1_LIB) : $$(rts_$1_OBJS) rts/libs.depend
 	"$$(RM)" $$(RM_OPTS) $$@
 	"$$(rts_dist_HC)" -shared -dynamic -dynload deploy \
 	  -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) -o $$@
+endif
 else
 $$(rts_$1_LIB) : $$(rts_$1_OBJS)
 	"$$(RM)" $$(RM_OPTS) $$@
-	echo $$(rts_$1_OBJS) | $$(XARGS) "$$(AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@
+	echo $$(rts_$1_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@
 endif
 
 endef
@@ -312,7 +365,7 @@ rts_dist_C_FILES = $(rts_C_SRCS) $(rts_thr_EXTRA_C_SRCS) $(rts_S_SRCS)
 
 $(eval $(call build-dependencies,rts,dist))
 
-$(rts_dist_depfile) : libffi/ffi.h
+$(rts_dist_depfile) : libffi/dist-install/build/ffi.h
 
 #-----------------------------------------------------------------------------
 # libffi stuff