-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-dll ::
- $(CP) -f libHSrts.a libHSrts_dll.a
- ar d libHSrts_dll.a Main.o
- $(DLLWRAP) -mno-cygwin --target=i386-mingw32 --export-all --output-lib libHSrts_imp.a --def HSrts.def -o HSrts.dll libHSrts_dll.a -lwinmm -lHS -lgmp -L. -Lgmp
+DLL_NAME = HSrts.dll
+ifeq "$(way)" "dll"
+DLL_IMPLIB_NAME = libHSrts_imp.a
+
+SRC_BLD_DLL_OPTS += --output-def=HSrts.def --export-all -L. -Lgmp -lwinmm \
+ -lHS_imp_stub -lgmp_imp
+
+#
+# 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_PEN)/$(DLL_NAME) :: libHS_imp_stub.a
+
+libHS_imp_stub.a :
+ dlltool --output-lib libHS_imp_stub.a --def HSprel.def --dllname HSstd.dll
+
+# It's not included in the DLL, but we need to compile it up separately.
+all :: Main.dll_o
+