X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=048b3a59b760aca6126ced3c788ff7003f285dcc;hb=81c8d88ac646fa6191528f6d29986598bb6ba116;hp=9d5ded7c99cf094693f4d9da5c1030fce7f8d7b1;hpb=06781a444251b6aabfd9079f85ebcfa794f9db23;p=ghc-hetmet.git diff --git a/ghc/Makefile b/ghc/Makefile index 9d5ded7..048b3a5 100644 --- a/ghc/Makefile +++ b/ghc/Makefile @@ -47,32 +47,37 @@ clean.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) 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,7 +94,7 @@ TOUCH_MAIN = $(RM) dist-stage1/build/ghc/ghc-tmp/Main.o endif endif -dist-stage%: boot.stage.% +dist-stage1 dist-stage2 dist-stage3: dist-stage%: boot.stage.% boot.stage.%: $(CABAL) configure --distpref dist-stage$* \ @@ -127,6 +132,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