Bug 873720 - Part 5: Only call into subtiers that perform work; r=ted

This commit is contained in:
Gregory Szorc 2013-05-23 16:28:11 -07:00
parent a373571c12
commit c85af048cd
2 changed files with 24 additions and 4 deletions

View File

@ -706,12 +706,22 @@ endif
define CREATE_TIER_RULE
tier_$(1)::
@echo "BUILDSTATUS TIER_START $(1)"
@echo "BUILDSTATUS SUBTIERS static export libs tools"
@printf "BUILDSTATUS SUBTIERS"
ifneq (,$(tier_$(1)_staticdirs))
@printf " static"
endif
ifneq (,$(tier_$(1)_dirs))
@printf " export libs tools"
endif
@printf "\n"
@echo "BUILDSTATUS STATICDIRS $$($$@_staticdirs)"
@echo "BUILDSTATUS DIRS $$($$@_dirs)"
ifneq (,$(tier_$(1)_staticdirs))
@echo "BUILDSTATUS SUBTIER_START $(1) static"
$$(foreach dir,$$($$@_staticdirs),$$(call TIER_DIR_SUBMAKE,,$$(dir)))
@echo "BUILDSTATUS SUBTIER_FINISH $(1) static"
endif
ifneq (,$(tier_$(1)_dirs))
@echo "BUILDSTATUS SUBTIER_START $(1) export"
$$(MAKE) export_$$@
@echo "BUILDSTATUS SUBTIER_FINISH $(1) export"
@ -722,7 +732,7 @@ tier_$(1)::
$$(MAKE) tools_$$@
@echo "BUILDSTATUS SUBTIER_FINISH $(1) tools"
@echo "BUILDSTATUS TIER_FINISH $(1)"
endif
endef
$(foreach tier,$(TIERS),$(eval $(call CREATE_TIER_RULE,$(tier))))

View File

@ -706,12 +706,22 @@ endif
define CREATE_TIER_RULE
tier_$(1)::
@echo "BUILDSTATUS TIER_START $(1)"
@echo "BUILDSTATUS SUBTIERS static export libs tools"
@printf "BUILDSTATUS SUBTIERS"
ifneq (,$(tier_$(1)_staticdirs))
@printf " static"
endif
ifneq (,$(tier_$(1)_dirs))
@printf " export libs tools"
endif
@printf "\n"
@echo "BUILDSTATUS STATICDIRS $$($$@_staticdirs)"
@echo "BUILDSTATUS DIRS $$($$@_dirs)"
ifneq (,$(tier_$(1)_staticdirs))
@echo "BUILDSTATUS SUBTIER_START $(1) static"
$$(foreach dir,$$($$@_staticdirs),$$(call TIER_DIR_SUBMAKE,,$$(dir)))
@echo "BUILDSTATUS SUBTIER_FINISH $(1) static"
endif
ifneq (,$(tier_$(1)_dirs))
@echo "BUILDSTATUS SUBTIER_START $(1) export"
$$(MAKE) export_$$@
@echo "BUILDSTATUS SUBTIER_FINISH $(1) export"
@ -722,7 +732,7 @@ tier_$(1)::
$$(MAKE) tools_$$@
@echo "BUILDSTATUS SUBTIER_FINISH $(1) tools"
@echo "BUILDSTATUS TIER_FINISH $(1)"
endif
endef
$(foreach tier,$(TIERS),$(eval $(call CREATE_TIER_RULE,$(tier))))