diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2010-06-16 12:47:18 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2010-06-16 12:47:18 +0000 |
| commit | a998343dfabe92da17b2f60c78968eff2f444050 (patch) | |
| tree | 9990dfff6970b22f8f1d8cb22fddeb2b8e72224d /compiler/ghc.mk | |
| parent | 8c4e569427730d8fb80883935c212014c382e052 (diff) | |
| download | haskell-a998343dfabe92da17b2f60c78968eff2f444050.tar.gz | |
pick up changes to $(GhcStage1HcOpts) without re-configuring the ghc package
Diffstat (limited to 'compiler/ghc.mk')
| -rw-r--r-- | compiler/ghc.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index e3746a45e9..7153dfe1ad 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 |