X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=0c0f3ec54c3c24f30837422600ba8f292523ccdb;hb=dc2a2f0673661e8a9414191c318f54cf374fbfbd;hp=5eff4daea8f408f77135a7b690d265287b90edc5;hpb=cf690bef85f23a001d110daad26b11057f58d8fc;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index 5eff4da..0c0f3ec 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -73,6 +73,10 @@ CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
 
+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))
+
 # 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))
@@ -89,6 +93,8 @@ TOUCH_MAIN = $(RM) dist-stage1/build/ghc/ghc-tmp/Main.o
 endif
 endif
 
+dist-stage1 dist-stage2 dist-stage3: dist-stage%: boot.stage.%
+
 boot.stage.%:
 	$(CABAL) configure --distpref dist-stage$*         \
 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
@@ -98,7 +104,7 @@ boot.stage.%:
 	                   --datadir='$$libdir'            \
 	                   --datasubdir=.
 
-build.stage.%:
+build.stage.%: dist-stage%
 	$(TOUCH_MAIN)
 	$(CABAL) build     --distpref dist-stage$* $(BUILD_FLAGS)
 	$(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' 'XXX/package.conf' "" \
@@ -125,6 +131,12 @@ install:
 	                   --distpref dist-stage2                         \
 	                   $(INSTALL_FLAGS)
 
+html:
+	@:
+
+install-docs:
+	@:
+
 include $(TOP)/mk/bindist.mk
-EXE_DIST_DIR = dist-stage$(stage)
+EXE_DIST_DIR = dist-stage2