X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FMakefile;h=7e9dc089415e4aca23703ce87e0d286eba290c79;hp=c13e49c903f6827ec1fc97e6853180a51b3c7803;hb=05b677fad57427a5639b36a1822c9ebd52cb3339;hpb=6fa4feaf2979419a6f6153ffa80c22a28f2f654f

diff --git a/rts/Makefile b/rts/Makefile
index c13e49c..7e9dc08 100644
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -35,6 +35,15 @@ GhcRtsHcOpts=
 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)
@@ -124,7 +133,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