X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=026e54da663de1cdd8e41c66a524f875df3fc59c;hb=c0d02c08259a36d83d5597c87196f5b03caf81dc;hp=ca3f96e83fc8d2f7c9b45354f460220e7a59af53;hpb=5a82864902fc01cf8eee847fcf4ee88e74aa535d;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index ca3f96e..026e54d 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -55,6 +55,7 @@ stage2 ::
 stage3 ::
 	$(MAKE) stage=3
 
+ifeq "$(CLEAN_ALL_STAGES)" "YES"
 clean distclean::
 	$(RM) -f prelude/primops.txt
 	$(RM) -f $(PRIMOP_BITS)
@@ -62,6 +63,7 @@ clean distclean::
 	$(RM) -f parser/Parser.y
 	$(RM) -rf stage1 stage2plus
 	$(RM) -f $(STAGE3_PACKAGE_CONF)
+endif
 
 ifeq "$(CLEAN_ALL_STAGES)" "YES"
 clean distclean:: clean.stage.1 clean.stage.2 clean.stage.3
@@ -78,6 +80,14 @@ CONFIGURE_FLAGS_STAGE2 += --flags=-stage1
 
 CONFIGURE_FLAGS_STAGE1 += --flags=-ghci
 
+ifeq "$(GhcWithNativeCodeGen)" "YES"
+CONFIGURE_FLAGS_STAGE1 += --flags=ncg
+CONFIGURE_FLAGS_STAGE2 += --flags=ncg
+else
+CONFIGURE_FLAGS_STAGE1 += --flags=-ncg
+CONFIGURE_FLAGS_STAGE2 += --flags=-ncg
+endif
+
 ifeq "$(GhcWithInterpreter)" "YES"
 CONFIGURE_FLAGS_STAGE2 += --flags=ghci
 
@@ -140,7 +150,7 @@ COMMON_CONFIGURE_FLAGS += --ghc-option=-DOMIT_NATIVE_CODEGEN
 endif
 
 ifeq "$(TargetOS_CPP)" "openbsd"
-COMMON_CONFIGURE_FLAGS += --ld-options="-Xlinker -E"
+COMMON_CONFIGURE_FLAGS += --ld-options=-E
 endif
 
 ifeq "$(GhcUnregisterised)" "NO"
@@ -186,9 +196,12 @@ boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) parser/Parser.y
 build.stage.%:
 	$(MAKE) -f Makefile-stage$* stage=$*
 	$(CABAL) register  --distpref dist-stage$* --inplace
+	$(MAKE) -C ../ghc stage=$*
 
 doc.stage.%:
-	$(CABAL) haddock --distpref dist-stage$*
+	$(CABAL) haddock --distpref dist-stage$* \
+	                 --haddock-option=--optghc=-DSTAGE=$* \
+	                 --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock
 
 # XXX We ought to actually install the (stage 2) library
 install:
@@ -439,6 +452,12 @@ primop-primop-info.hs-incl: prelude/primops.txt
 primop-usage.hs-incl: prelude/primops.txt
 	$(GENPRIMOP) --usage              < $< > $@
 
+html:
+	$(MAKE) doc stage=2
+
+install-docs:
+	@:
+
 #-----------------------------------------------------------------------------
 # binary-dist
 #