X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=ed7d24b643466285e4314c3e96a8c6d240683d2d;hb=a196ef836e60e20714fd3e6bc9003979d6e5a139;hp=23a5384d58d6747bbb8c3457caa069f35a3b01fe;hpb=894775f034d278ff5493eeaf8587914626e8df21;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index 23a5384..ed7d24b 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -36,13 +36,13 @@ stage3 ::
 
 
 ifeq "$(CLEAN_ALL_STAGES)" "YES"
-clean distclean:: clean.stage.1 clean.stage.2 clean.stage.3
+clean distclean maintainer-clean:: clean.stage.1 clean.stage.2 clean.stage.3
 else
-clean distclean:: clean.stage.$(stage)
+clean distclean maintainer-clean:: clean.stage.$(stage)
 endif
 
 ifeq "$(CLEAN_ALL_STAGES)" "YES"
-distclean::
+distclean maintainer-clean::
 	$(RM) -f ghc-bin.cabal
 endif
 
@@ -83,14 +83,16 @@ CONFIGURE_FLAGS_STAGE3 = $(CONFIGURE_FLAGS_STAGE2PLUS)
 CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
+CONFIGURE_FLAGS_STAGE3 += --package-db $(STAGE3_PACKAGE_CONF)
 
 CONFIGURE_FLAGS_STAGE1 += $(foreach flag, $(GhcStage1HcOpts), --ghc-option=$(flag))
 CONFIGURE_FLAGS_STAGE2 += $(foreach flag, $(GhcStage2HcOpts), --ghc-option=$(flag))
 CONFIGURE_FLAGS_STAGE3 += $(foreach flag, $(GhcStage3HcOpts), --ghc-option=$(flag))
 
+BUILD_FLAGS += $(patsubst %, --ghc-option=%, $(SRC_HC_OPTS))
 # Allow EXTRA_HC_OPTS to be used from the command line to add options 
 # when building (e.g. -v)
-BUILD_FLAGS=$(patsubst %, --ghc-option=%, $(EXTRA_HC_OPTS))
+BUILD_FLAGS += $(patsubst %, --ghc-option=%, $(EXTRA_HC_OPTS))
 
 # XXX In stage2+ we should really use the inplace ghc-pkg
 # It works because installPackage doesn't actually use ghc-pkg, as there's