X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=0c0f3ec54c3c24f30837422600ba8f292523ccdb;hb=2fa48f4ea462a6e7f0bb22a8c292ee4efcec81e0;hp=4735e3b9fdab85cd449d30b14e74ac0aab3f4e94;hpb=bd72e9436d244c09946a7795c41c4b4b62dd53a5;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index 4735e3b..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))
@@ -127,9 +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