diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-04-27 16:22:12 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-04-27 16:22:12 +0000 |
| commit | a19691137898050be08580092ed6f22213f66c27 (patch) | |
| tree | 9451a8c316d8796a667cdaf4f5066d16927e4c3d | |
| parent | 1cfd9c70b82517183d86958ea331f60108baea7e (diff) | |
| download | haskell-a19691137898050be08580092ed6f22213f66c27.tar.gz | |
Fix "make 2"
The new Makefile logic was enabling the stage 1 rules when stage=2,
so "make 2" was rebuilding stage 1.
| -rw-r--r-- | compiler/ghc.mk | 8 | ||||
| -rw-r--r-- | ghc/ghc.mk | 7 |
2 files changed, 14 insertions, 1 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index ef662f6864..3b12f7c019 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -439,13 +439,19 @@ compiler_stage1_SplitObjs = NO compiler_stage2_SplitObjs = NO compiler_stage3_SplitObjs = NO +# If we "make 1" or "make 2" then we don't want the rules for the stage +# that we haven't been asked to build ifeq "$(stage)" "1" compiler_stage2_NOT_NEEDED = YES endif +ifeq "$(stage)" "2" +compiler_stage1_NOT_NEEDED = YES +endif +# We don't want the rules for stage3 unless we have been explicitly +# asked to build it ifneq "$(stage)" "3" compiler_stage3_NOT_NEEDED = YES endif - $(eval $(call build-package,compiler,stage1,0)) $(eval $(call build-package,compiler,stage2,1)) $(eval $(call build-package,compiler,stage3,2)) diff --git a/ghc/ghc.mk b/ghc/ghc.mk index 4c98b3e886..02033444b1 100644 --- a/ghc/ghc.mk +++ b/ghc/ghc.mk @@ -103,9 +103,16 @@ define ghc_stage$(INSTALL_GHC_STAGE)_INSTALL_SHELL_WRAPPER_EXTRA echo 'executablename="$$exedir/ghc"' >> "$(WRAPPER)" endef +# If we "make 1" or "make 2" then we don't want the rules for the stage +# that we haven't been asked to build ifeq "$(stage)" "1" ghc_stage2_NOT_NEEDED = YES endif +ifeq "$(stage)" "2" +ghc_stage1_NOT_NEEDED = YES +endif +# We don't want the rules for stage3 unless we have been explicitly +# asked to build it ifneq "$(stage)" "3" ghc_stage3_NOT_NEEDED = YES endif |