X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghc.mk;h=9d1a2d9dff8c94421b410b2b9ec6af913b83b027;hb=85f096f8051d4a5c20ac36c1b8866007ad4146c3;hp=48554db88f3bf2531046f57adce02c8945060416;hpb=97d52dd73c5f39d8e671a24137130db1bbd28116;p=ghc-hetmet.git

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 48554db..9d1a2d9 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))