projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UNDO: FIX #2375: remove oc->lochash completely, it apparently isn't used
[ghc-hetmet.git]
/
rts
/
Makefile
diff --git
a/rts/Makefile
b/rts/Makefile
index
ab1eb3d
..
8ca69ef
100644
(file)
--- a/
rts/Makefile
+++ b/
rts/Makefile
@@
-152,8
+152,6
@@
SRC_CC_OPTS += $(STANDARD_OPTS)
SRC_CC_OPTS += $(GhcRtsCcOpts)
SRC_HC_OPTS += $(GhcRtsHcOpts) $(STANDARD_OPTS) -package-name rts
SRC_CC_OPTS += $(GhcRtsCcOpts)
SRC_HC_OPTS += $(GhcRtsHcOpts) $(STANDARD_OPTS) -package-name rts
-SRC_HC_OPTS += -fvia-C
-
ifneq "$(GhcWithSMP)" "YES"
SRC_CC_OPTS += -DNOSMP
SRC_HC_OPTS += -optc-DNOSMP
ifneq "$(GhcWithSMP)" "YES"
SRC_CC_OPTS += -DNOSMP
SRC_HC_OPTS += -optc-DNOSMP
@@
-163,6
+161,12
@@
ifeq "$(UseLibFFIForAdjustors)" "YES"
SRC_CC_OPTS += -DUSE_LIBFFI_FOR_ADJUSTORS
endif
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
ifneq "$(DYNAMIC_RTS)" "YES"
SRC_HC_OPTS += -static
else
@@
-293,7
+297,11
@@
ifneq "$(PapiLibDirs)" ""
SRC_LD_OPTS += -L$(PapiLibDirs)
endif
SRC_LD_OPTS += -L$(PapiLibDirs)
endif
-endif # GhcRtsWithPapi==YES
+else # GhcRtsWithPapi==YES
+
+PACKAGE_CPP_OPTS += -DPAPI_LIB_DIR=""
+
+endif
#-----------------------------------------------------------------------------
# make depend setup
#-----------------------------------------------------------------------------
# make depend setup