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

diff --git a/rts/Makefile b/rts/Makefile
index a17eb2a..8ca69ef 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