Eq and Ord have moved into GHC.Classes

[ghc-hetmet.git] / rts / Makefile

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