diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-04-24 18:18:23 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-04-24 18:18:23 +0000 |
| commit | 85f096f8051d4a5c20ac36c1b8866007ad4146c3 (patch) | |
| tree | 9e31482f67a0f28827edfb2b81784747352dae7a /compiler/ghc.mk | |
| parent | 5a6c2ce786ec8daf2e63f08513d17496414c18f2 (diff) | |
| download | haskell-85f096f8051d4a5c20ac36c1b8866007ad4146c3.tar.gz | |
Make sure all the clean rules are always included
In particular, this fixes a problem where stage3 bits weren't being cleaned
Diffstat (limited to 'compiler/ghc.mk')
| -rw-r--r-- | compiler/ghc.mk | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 48554db88f..9d1a2d9dff 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -439,24 +439,18 @@ compiler_stage1_SplitObjs = NO compiler_stage2_SplitObjs = NO compiler_stage3_SplitObjs = NO -# For now, bindists always use stage 2 -ifneq "$(BINDIST)" "YES" -# stage 1 is enabled unless $(stage) is set to something other than 1 -ifeq "$(filter-out 1,$(stage))" "" -$(eval $(call build-package,compiler,stage1,0)) +ifeq "$(stage)" "1" +compiler_stage2_NOT_NEEDED = YES endif +ifneq "$(stage)" "3" +compiler_stage3_NOT_NEEDED = YES endif -# stage 2 is enabled unless $(stage) is set to something other than 2 -ifeq "$(filter-out 2,$(stage))" "" +$(eval $(call build-package,compiler,stage1,0)) $(eval $(call build-package,compiler,stage2,1)) -endif +$(eval $(call build-package,compiler,stage3,2)) ifneq "$(BINDIST)" "YES" -# stage 3 has to be requested explicitly with stage=3 -ifeq "$(stage)" "3" -$(eval $(call build-package,compiler,stage3,2)) -endif compiler_stage2_TAGS_HC_OPTS = -package ghc $(eval $(call tags-package,compiler,stage2)) |