Bug 1371871 - Run the artifact tier during a tup artifact build. r=mshal
authorChris Manchester <cmanchester@mozilla.com>
Wed, 21 Jun 2017 16:20:18 -0700
changeset 365254 0d28abfd6ad4d3aeaf7ff0167dac59c18998a994
parent 365253 4807dbbaccc30e6816b19525c786dcda1ffbea32
child 365255 b51657a3495ddaff1e0f61818cd43573c8a18929
push id45243
push usercmanchester@mozilla.com
push dateWed, 21 Jun 2017 23:24:40 +0000
treeherderautoland@0d28abfd6ad4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1371871
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1371871 - Run the artifact tier during a tup artifact build. r=mshal MozReview-Commit-ID: BIKtzjfu2SF
Makefile.in
--- 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