X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMakefile;h=3cde19d173a52f34d5bcf16e401cb1fc0d9f3a8f;hb=98c68a1c5b63aadf9c7917274519d95bbe9394d4;hp=c310ee07249e5963952b9413a1badaf09e0e46b9;hpb=a61629589f42ec2c08ad177ff24eaf53682dfb63;p=ghc-hetmet.git

diff --git a/rts/Makefile b/rts/Makefile
index c310ee0..3cde19d 100644
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -25,6 +25,14 @@ PACKAGE = rts
 
 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
 
@@ -35,6 +43,10 @@ GhcRtsHcOpts=
 GhcRtsCcOpts=-g -O0
 endif
 
+ifeq "$(BeConservative)" "YES"
+GhcRtsCcOpts += -DBE_CONSERVATIVE
+endif
+
 # -----------------------------------------------------------------------------
 
 # There's nothing for Haddock here...
@@ -129,7 +141,7 @@ SRC_CC_OPTS += $(WARNING_OPTS)
 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