X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FMakefile;h=639076a0bbed8fac31c930b78df7d88fcf6ba2ac;hp=aaecaf14b155fb1aa4d83a884e15b98c01af2998;hb=e95ee1f718c6915c478005aad8af81705357d6ab;hpb=47f42dc1ee6a5f42133674d0a6684b077e25be6e

diff --git a/compiler/Makefile b/compiler/Makefile
index aaecaf1..639076a 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -10,19 +10,38 @@
 #
 # -----------------------------------------------------------------------------
 
+# If the user says 'make' or 'make stage=2' here, we behave as if they were
+# in the ghc directory instead, so that the executable GHC gets built.
+.PHONY: default_to_ghc all_ghc
+default_to_ghc : all_ghc
+
 dir = compiler
 TOP = ..
 SPEC_TARGETS = 1 2 3
 include $(TOP)/mk/sub-makefile.mk
 
+all_ghc :
+	+$(TOPMAKE) all_ghc $(EXTRA_MAKE_OPTS)
+
+FAST_MAKE_OPTS += compiler_stage1_NO_BUILD_DEPS=YES compiler_stage2_NO_BUILD_DEPS=YES compiler_stage3_NO_BUILD_DEPS=YES
+
 .PHONY: 1 2 3
 
 1:
-	+$(TOPMAKE) stage=1 all_ghc_stage1 compiler_stage1_NO_BUILD_DEPS=YES OMIT_PHASE_1=YES OMIT_PHASE_2=YES OMIT_PHASE_3=YES
+	+$(TOPMAKE) stage=1 all_ghc_stage1 $(FAST_MAKE_OPTS) NO_STAGE1_DEPS=YES NO_STAGE2_DEPS=YES
 
 2:
-	+$(TOPMAKE) stage=2 all_ghc_stage2 compiler_stage2_NO_BUILD_DEPS=YES OMIT_PHASE_1=YES OMIT_PHASE_2=YES OMIT_PHASE_3=YES
+	+$(TOPMAKE) stage=2 all_ghc_stage2 $(FAST_MAKE_OPTS) NO_STAGE2_DEPS=YES
 
 3:
-	+$(TOPMAKE) stage=3 all_ghc_stage3 compiler_stage3_NO_BUILD_DEPS=YES OMIT_PHASE_1=YES OMIT_PHASE_2=YES OMIT_PHASE_3=YES
+	+$(TOPMAKE) stage=3 all_ghc_stage3 $(FAST_MAKE_OPTS) NO_STAGE3_DEPS=YES
 
+.PHONY: extra-help
+help : extra-help
+extra-help :
+	@echo "  make 1"
+	@echo "  make 2"
+	@echo "  make 3"
+	@echo
+	@echo "     Build the stage 1, 2 or 3 GHC respectively, omitting dependencies"
+	@echo "     and initial phases for speed."