X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=23a5384d58d6747bbb8c3457caa069f35a3b01fe;hb=7654ff058ca281756dd98ee976685a9261df63f0;hp=0c0f3ec54c3c24f30837422600ba8f292523ccdb;hpb=6c0441c137c46d4773c088671e1ce84844e94b7c;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index 0c0f3ec..23a5384 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -34,40 +34,51 @@ stage2 ::
 stage3 ::
 	$(MAKE) stage=3
 
+
 ifeq "$(CLEAN_ALL_STAGES)" "YES"
 clean distclean:: clean.stage.1 clean.stage.2 clean.stage.3
 else
 clean distclean:: clean.stage.$(stage)
 endif
 
+ifeq "$(CLEAN_ALL_STAGES)" "YES"
+distclean::
+	$(RM) -f ghc-bin.cabal
+endif
+
 clean.stage.%:
-	-$(CABAL) clean --distpref dist-stage$*
 	$(RM) -rf stage$*-inplace
+# This is a bit naughty. We ought to use:
+#	-$(CABAL) clean --distpref dist-stage$*
+# but that won't work if the Cabal file (a generated file) doesn't
+# exist. So we do this instead:
+	$(RM) -rf dist-stage$*
 
 CONFIGURE_FLAGS_STAGE1 += --flags=-ghci
 
 ifeq "$(GhcWithInterpreter)" "YES"
-CONFIGURE_FLAGS_STAGE2 += --flags=ghci
+CONFIGURE_FLAGS_STAGE2PLUS += --flags=ghci
 else
-CONFIGURE_FLAGS_STAGE2 += --flags=-ghci
+CONFIGURE_FLAGS_STAGE2PLUS += --flags=-ghci
 endif
 
 ifeq "$(GhcProfiled)" "YES"
-CONFIGURE_FLAGS_STAGE2 += --enable-executable-profiling
+CONFIGURE_FLAGS_STAGE2PLUS += --enable-executable-profiling
 endif
 ifeq "$(GhcDebugged)" "YES"
-CONFIGURE_FLAGS_STAGE2 += --ghc-option=-debug
+CONFIGURE_FLAGS_STAGE2PLUS += --ghc-option=-debug
 endif
 ifeq "$(GhcThreaded)" "YES"
 # Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
-CONFIGURE_FLAGS_STAGE2 += --ghc-option=-threaded
+CONFIGURE_FLAGS_STAGE2PLUS += --ghc-option=-threaded
 endif
 
 ifeq "$(BuildSharedLibs)" "YES"
-CONFIGURE_FLAGS_STAGE2 += --ghc-option=-dynamic
+CONFIGURE_FLAGS_STAGE2PLUS += --ghc-option=-dynamic
 endif
 
-CONFIGURE_FLAGS_STAGE3 = $(CONFIGURE_FLAGS_STAGE2)
+CONFIGURE_FLAGS_STAGE2 = $(CONFIGURE_FLAGS_STAGE2PLUS)
+CONFIGURE_FLAGS_STAGE3 = $(CONFIGURE_FLAGS_STAGE2PLUS)
 
 CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS)