diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2010-05-20 10:44:55 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2010-05-20 10:44:55 +0000 |
| commit | 6ffa3d7122aa1e1e43850fd9754eb7585808c4ac (patch) | |
| tree | 38d7eacdde5dbc77dbe51c425736237c3211729b | |
| parent | 5e31722536dab26e945a466f5eba1578b470a1b9 (diff) | |
| download | haskell-6ffa3d7122aa1e1e43850fd9754eb7585808c4ac.tar.gz | |
the 'stage=0' trick to disable all compiler builds stopped working; fix it
| -rw-r--r-- | compiler/ghc.mk | 15 | ||||
| -rw-r--r-- | ghc/ghc.mk | 15 |
2 files changed, 14 insertions, 16 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 3b12f7c019..1c61494b18 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -439,16 +439,15 @@ 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" +# if stage is set to something other than "1" or "", disable stage 1 +ifneq "$(filter-out 1,$(stage))" "" compiler_stage1_NOT_NEEDED = YES endif -# We don't want the rules for stage3 unless we have been explicitly -# asked to build it +# if stage is set to something other than "2" or "", disable stage 2 +ifneq "$(filter-out 2,$(stage))" "" +compiler_stage2_NOT_NEEDED = YES +endif +# stage 3 has to be requested explicitly with stage=3 ifneq "$(stage)" "3" compiler_stage3_NOT_NEEDED = YES endif diff --git a/ghc/ghc.mk b/ghc/ghc.mk index 7f03f43f0d..3b68d5b3b9 100644 --- a/ghc/ghc.mk +++ b/ghc/ghc.mk @@ -108,16 +108,15 @@ 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" +# if stage is set to something other than "1" or "", disable stage 1 +ifneq "$(filter-out 1,$(stage))" "" ghc_stage1_NOT_NEEDED = YES endif -# We don't want the rules for stage3 unless we have been explicitly -# asked to build it +# if stage is set to something other than "2" or "", disable stage 2 +ifneq "$(filter-out 2,$(stage))" "" +ghc_stage2_NOT_NEEDED = YES +endif +# stage 3 has to be requested explicitly with stage=3 ifneq "$(stage)" "3" ghc_stage3_NOT_NEEDED = YES endif |