From a998343dfabe92da17b2f60c78968eff2f444050 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 16 Jun 2010 12:47:18 +0000 Subject: [PATCH] pick up changes to $(GhcStage1HcOpts) without re-configuring the ghc package --- compiler/ghc.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/compiler/ghc.mk b/compiler/ghc.mk index e3746a4..7153dfe 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -397,10 +397,6 @@ compiler_stage2_CONFIGURE_OPTS += --ghc-option=-DSTAGE=2 compiler_stage3_CONFIGURE_OPTS += --ghc-option=-DSTAGE=3 compiler_stage2_HADDOCK_OPTS += --optghc=-DSTAGE=2 -compiler_stage1_CONFIGURE_OPTS += --ghc-options='$(GhcStage1HcOpts)' -compiler_stage2_CONFIGURE_OPTS += --ghc-options='$(GhcStage2HcOpts)' -compiler_stage3_CONFIGURE_OPTS += --ghc-options='$(GhcStage3HcOpts)' - compiler/stage1/package-data.mk : compiler/ghc.mk compiler/stage2/package-data.mk : compiler/ghc.mk compiler/stage3/package-data.mk : compiler/ghc.mk @@ -465,6 +461,11 @@ $(eval $(call build-package,compiler,stage1,0)) $(eval $(call build-package,compiler,stage2,1)) $(eval $(call build-package,compiler,stage3,2)) +# after build-package, because that sets compiler_stage1_HC_OPTS: +compiler_stage1_HC_OPTS += $(GhcStage1HcOpts) +compiler_stage2_HC_OPTS += $(GhcStage2HcOpts) +compiler_stage3_HC_OPTS += $(GhcStage3HcOpts) + ifneq "$(BINDIST)" "YES" compiler_stage2_TAGS_HC_OPTS = -package ghc -- 1.7.10.4