projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX #1765, #1766
[ghc-hetmet.git]
/
rts
/
Makefile
diff --git
a/rts/Makefile
b/rts/Makefile
index
4e1c915
..
3cde19d
100644
(file)
--- a/
rts/Makefile
+++ b/
rts/Makefile
@@
-25,6
+25,14
@@
PACKAGE = rts
HC=$(GHC_INPLACE)
HC=$(GHC_INPLACE)
+
+# Setting _way here is a nasty hack to make sure we get libHSrts*.a etc
+# rather than just libHSrts.a when we are making and installing
+# bindists.
+ifeq "$(DOING_BIN_DIST)" "YES"
+_way = *
+endif
+
# -----------------------------------------------------------------------------
# RTS ways
# -----------------------------------------------------------------------------
# RTS ways
@@
-35,6
+43,15
@@
GhcRtsHcOpts=
GhcRtsCcOpts=-g -O0
endif
GhcRtsCcOpts=-g -O0
endif
+ifeq "$(BeConservative)" "YES"
+GhcRtsCcOpts += -DBE_CONSERVATIVE
+endif
+
+# -----------------------------------------------------------------------------
+
+# There's nothing for Haddock here...
+override HADDOCK_DOCS = NO
+
# -----------------------------------------------------------------------------
# Tells the build system not to add various Haskellish options to $(SRC_HC_OPTS)
# -----------------------------------------------------------------------------
# Tells the build system not to add various Haskellish options to $(SRC_HC_OPTS)
@@
-124,7
+141,7
@@
SRC_CC_OPTS += $(WARNING_OPTS)
SRC_CC_OPTS += $(STANDARD_OPTS)
SRC_CC_OPTS += $(GhcRtsCcOpts)
SRC_CC_OPTS += $(STANDARD_OPTS)
SRC_CC_OPTS += $(GhcRtsCcOpts)
-SRC_HC_OPTS += $(GhcRtsHcOpts) -package-name rts
+SRC_HC_OPTS += $(GhcRtsHcOpts) $(STANDARD_OPTS) -package-name rts
ifneq "$(GhcWithSMP)" "YES"
SRC_CC_OPTS += -DNOSMP
ifneq "$(GhcWithSMP)" "YES"
SRC_CC_OPTS += -DNOSMP
@@
-175,6
+192,13
@@
StgCRun_CC_OPTS += -w
Typeable_CC_OPTS += -w
RetainerProfile_CC_OPTS += -w
sm/Compact_CC_OPTS += -w
Typeable_CC_OPTS += -w
RetainerProfile_CC_OPTS += -w
sm/Compact_CC_OPTS += -w
+# On Windows:
+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
# 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