X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMakefile;h=9d5d6ec5394850a7f862c1ffd1d25a4e03cf40cf;hb=a200038f469418fef77d863dc3d1cd0125ec1e82;hp=6fe606943ed9f00e7c55dee0358d64503a47a89e;hpb=d16f69bd77467961e80e27caff5c5bd686afa90b;p=ghc-hetmet.git

diff --git a/rts/Makefile b/rts/Makefile
index 6fe6069..9d5d6ec 100644
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -161,6 +161,12 @@ ifeq "$(UseLibFFIForAdjustors)" "YES"
 SRC_CC_OPTS += -DUSE_LIBFFI_FOR_ADJUSTORS
 endif
 
+ifeq "$(Windows)" "YES"
+# SDM: when compiled with -fasm the RTS currently has bogus references to 
+# __imp_base_ things, so working around for now:
+SRC_HC_OPTS = -fvia-C
+endif
+
 ifneq "$(DYNAMIC_RTS)" "YES"
 SRC_HC_OPTS += -static
 else
@@ -211,9 +217,6 @@ sm/Compact_CC_OPTS += -w
 win32/ConsoleHandler_CC_OPTS += -w
 win32/ThrIOManager_CC_OPTS += -w
 win32/Ticker_CC_OPTS += -w
-Threads_CC_OPTS += -w
-Capability_CC_OPTS += -w
-Schedule_CC_OPTS += -w
 # The above warning supression flags are a temporary kludge.
 # While working on this module you are encouraged to remove it and fix
 # any warnings in the module. See
@@ -462,13 +465,8 @@ endif
 #
 # binary-dist
 
-binary-dist:
-	$(INSTALL_DIR)                         $(BIN_DIST_DIR)/rts
-	$(INSTALL_DATA)    Makefile            $(BIN_DIST_DIR)/rts/
-	$(INSTALL_DATA)    package.conf.in     $(BIN_DIST_DIR)/rts/
-ifneq "$(INSTALL_LIBS)" ""
-	$(INSTALL_DATA)    $(INSTALL_LIBS)     $(BIN_DIST_DIR)/rts/
-endif
-ifneq "$(INSTALL_LIBEXECS)" ""
-	$(INSTALL_PROGRAM) $(INSTALL_LIBEXECS) $(BIN_DIST_DIR)/rts/
-endif
+BINDIST_EXTRAS += package.conf.in
+BINDIST_EXTRAS += $(INSTALL_LIBS)
+BINDIST_EXTRAS += $(INSTALL_LIBEXECS)
+include $(TOP)/mk/bindist.mk
+