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

diff --git a/rts/Makefile b/rts/Makefile
index a17eb2a..ab5c6e7 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
@@ -202,6 +208,7 @@ RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=$(DQ)$(GhcEnableTablesNextToCode
 # ffi.h triggers prototype warnings, so disable them here:
 Interpreter_CC_OPTS += -Wno-strict-prototypes
 Adjustor_CC_OPTS += -Wno-strict-prototypes
+sm/Storage_CC_OPTS += -Wno-strict-prototypes
 
 StgCRun_CC_OPTS += -w
 Typeable_CC_OPTS += -w
@@ -211,9 +218,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
@@ -291,7 +295,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
@@ -397,6 +405,7 @@ sm/Evac_HC_OPTS += -optc-funroll-loops
 
 ifneq "$(findstring thr, $(way))" ""
 EXTRA_SRCS += sm/Evac_thr.c sm/Scav_thr.c
+CLEAN_FILES += sm/Evac_thr.c sm/Scav_thr.c
 
 sm/Evac_thr.c : sm/Evac.c
 	cp $< $@
@@ -458,13 +467,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
+