Bug 1371871 - Run the artifact tier during a tup artifact build.
MozReview-Commit-ID: BIKtzjfu2SF
--- a/Makefile.in
+++ b/Makefile.in
@@ -142,17 +142,22 @@ ifneq (,$(filter FasterMake+RecursiveMak
install-manifests: faster
.PHONY: faster
faster: install-dist/idl
$(MAKE) -C faster FASTER_RECURSIVE_MAKE=1
endif
.PHONY: tup
tup:
- $(call BUILDSTATUS,TIERS make tup)
+ $(call BUILDSTATUS,TIERS $(if $(MOZ_ARTIFACT_BUILDS),artifact )make tup)
+ifdef MOZ_ARTIFACT_BUILDS
+ $(call BUILDSTATUS,TIER_START artifact)
+ $(MAKE) recurse_artifact
+ $(call BUILDSTATUS,TIER_FINISH artifact)
+endif
$(call BUILDSTATUS,TIER_START make)
$(MAKE) buildid.h source-repo.h
$(call BUILDSTATUS,TIER_FINISH make)
$(call BUILDSTATUS,TIER_START tup)
@$(TUP) $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),,--verbose)
$(call BUILDSTATUS,TIER_FINISH tup)
# process_install_manifest needs to be invoked with --no-remove when building