Fix ghci in stage3

[ghc-hetmet.git] / ghc / Makefile

diff --git a/ghc/Makefile b/ghc/Makefile
index 669c938..46301a4 100644 (file)
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -15,18 +15,38 @@ TOP = ..
 SPEC_TARGETS = 1 2 3
 include $(TOP)/mk/sub-makefile.mk
 
-FAST_MAKE_OPTS += compiler_stage1_NO_BUILD_DEPS=YES compiler_stage2_NO_BUILD_DEPS=YES compiler_stage3_NO_BUILD_DEPS=YES
+FAST_MAKE_OPTS += compiler_stage1_NO_BUILD_DEPS=YES \
+                  compiler_stage2_NO_BUILD_DEPS=YES \
+                  compiler_stage3_NO_BUILD_DEPS=YES \
+                  ghc_stage1_NO_BUILD_DEPS=YES \
+                  ghc_stage2_NO_BUILD_DEPS=YES \
+                  ghc_stage3_NO_BUILD_DEPS=YES
 
 .PHONY: 1 2 3
 
 1:
-       +$(TOPMAKE) stage=1 all_ghc_stage1 $(FAST_MAKE_OPTS)
+       +$(TOPMAKE) stage=1 all_ghc_stage1 $(FAST_MAKE_OPTS) NO_STAGE1_DEPS=YES NO_STAGE2_DEPS=YES
 
 2:
-       +$(TOPMAKE) stage=2 all_ghc_stage2 $(FAST_MAKE_OPTS)
+       +$(TOPMAKE) stage=2 all_ghc_stage2 $(FAST_MAKE_OPTS) NO_STAGE2_DEPS=YES
 
 3:
-       +$(TOPMAKE) stage=3 all_ghc_stage3 $(FAST_MAKE_OPTS)
+       +$(TOPMAKE) stage=3 all_ghc_stage3 $(FAST_MAKE_OPTS) NO_STAGE3_DEPS=YES
+
+
+# 'make re2' rebuilds stage2, removing the old executable first.  Useful for
+# something like 'make re2 GhcDebugged=YES'.
+
+.PHONY: re1 re2 re3
+re1:
+       $(RM) stage1/build/tmp/ghc-stage1
+       $(MAKE) 1
+re2:
+       $(RM) stage2/build/tmp/ghc-stage2
+       $(MAKE) 2
+re3:
+       $(RM) stage3/build/tmp/ghc-stage3
+       $(MAKE) 3
 
 .PHONY: extra-help
 help : extra-help