Bug 1451530 - Pass the current topobjdir to our Tup invocation. draft
authorChris Manchester <cmanchester@mozilla.com>
Wed, 04 Apr 2018 15:13:13 -0700
changeset 777519 7624627ce8970c78e32674171d0661536ebe0154
parent 777518 82a71a86ab1ac130c39e09d733cdb13c71bd1604
child 777525 d4db6eab08dd6e0a6474f30cce8ca5bd5e4db9ef
push id105237
push userbmo:cmanchester@mozilla.com
push dateWed, 04 Apr 2018 22:13:38 +0000
bugs1451530
milestone61.0a1
Bug 1451530 - Pass the current topobjdir to our Tup invocation. MozReview-Commit-ID: D6UNvxwfGTa
Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -153,17 +153,17 @@ endif
 tup:
 	$(call BUILDSTATUS,TIERS $(if $(MOZ_ARTIFACT_BUILDS),artifact )tup)
 ifdef MOZ_ARTIFACT_BUILDS
 	$(call BUILDSTATUS,TIER_START artifact)
 	$(MAKE) recurse_artifact
 	$(call BUILDSTATUS,TIER_FINISH artifact)
 endif
 	$(call BUILDSTATUS,TIER_START tup)
-	@$(TUP) $(if $(MOZ_AUTOMATION),--quiet) $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),,--verbose)
+	@$(TUP) $(if $(MOZ_AUTOMATION),--quiet) $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),,--verbose) $(topobjdir)
 	$(call BUILDSTATUS,TIER_FINISH tup)
 
 .PHONY: $(addprefix install-,$(install_manifests))
 $(addprefix install-,$(install_manifests)): install-%: $(install_manifest_depends)
 ifneq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
 	@# If we're using the hybrid FasterMake/RecursiveMake backend, we want
 	@# to ensure the FasterMake end doesn't have install manifests for the
 	@# same directory, because that would blow up