Give locations of flag warnings/errors

[ghc-hetmet.git] / compiler / Makefile

diff --git a/compiler/Makefile b/compiler/Makefile
index c0f703e..67d4e3f 100644 (file)
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -55,25 +55,39 @@ stage2 ::
 stage3 ::
        $(MAKE) stage=3
 
+ifeq "$(CLEAN_ALL_STAGES)" "YES"
 clean distclean::
-       -$(CABAL) clean --distpref dist-stage1
-       -$(CABAL) clean --distpref dist-stage2
-       -$(CABAL) clean --distpref dist-stage3
-       $(RM) -f Makefile-stage1
-       $(RM) -f Makefile-stage2
-       $(RM) -f Makefile-stage3
        $(RM) -f prelude/primops.txt
        $(RM) -f $(PRIMOP_BITS)
        $(RM) -f $(CONFIG_HS)
        $(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
+else
+clean distclean:: clean.stage.$(stage)
+endif
+
+clean.stage.%:
+       -$(CABAL) clean --distpref dist-stage$*
+       $(RM) -f Makefile-stage$*
 
 CONFIGURE_FLAGS_STAGE1 += --flags=stage1
 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
 
@@ -182,6 +196,7 @@ 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$*
@@ -435,6 +450,9 @@ primop-primop-info.hs-incl: prelude/primops.txt
 primop-usage.hs-incl: prelude/primops.txt
        $(GENPRIMOP) --usage              < $< > $@
 
+install-docs:
+       @:
+
 #-----------------------------------------------------------------------------
 # binary-dist
 #