Fix "make 2"

[ghc-hetmet.git] / ghc / ghc.mk

diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 1f0b287..0203344 100644 (file)
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -103,20 +103,22 @@ define ghc_stage$(INSTALL_GHC_STAGE)_INSTALL_SHELL_WRAPPER_EXTRA
 echo 'executablename="$$exedir/ghc"' >> "$(WRAPPER)"
 endef
 
-# stage 1 is enabled unless $(stage) is set to something other than 1
-ifeq "$(filter-out 1,$(stage))" ""
-$(eval $(call build-prog,ghc,stage1,0))
+# 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
-
-# stage 2 is enabled unless $(stage) is set to something other than 2
-ifeq "$(filter-out 2,$(stage))" ""
-$(eval $(call build-prog,ghc,stage2,1))
+ifeq "$(stage)" "2"
+ghc_stage1_NOT_NEEDED = YES
 endif
-
-# stage 3 has to be requested explicitly with stage=3
-ifeq "$(stage)" "3"
-$(eval $(call build-prog,ghc,stage3,2))
+# 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
+$(eval $(call build-prog,ghc,stage1,0))
+$(eval $(call build-prog,ghc,stage2,1))
+$(eval $(call build-prog,ghc,stage3,2))
 
 ifneq "$(BINDIST)" "YES"