X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMakefile;h=09f5766dd49e520658e8fe8c4eb0d0bae9976277;hb=9ecd4031627be89cfe92d80b8a96e6b44a06aeec;hp=a17eb2ac4bbc483619001cabd2dec1a2c339476e;hpb=8ba7bea1b3993df0cfe9baa02fa74f3a356afffa;p=ghc-hetmet.git

diff --git a/rts/Makefile b/rts/Makefile
index a17eb2a..09f5766 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
@@ -291,7 +297,11 @@ ifneq "$(PapiLibDirs)" ""
 SRC_LD_OPTS += -L$(PapiLibDirs)
 endif
 
-endif # GhcRtsWithPapi==YES
+else # GhcRtsWithPapi==YES
+
+PACKAGE_CPP_OPTS += -DPAPI_LIB_DIR=""
+
+endif
 
 #-----------------------------------------------------------------------------
 # make depend setup
@@ -458,13 +468,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
+