Bug 1304143 - pass --verbose flag to tup when not running 'make -s'; r?chmanchester draft
authorMike Shal <mshal@mozilla.com>
Mon, 12 Sep 2016 15:09:15 -0400
changeset 415621 728fe1977df658b15d96360e14c4766528d98e2a
parent 415108 fd0564234eca242b7fb753a110312679020f8059
child 415622 f558916584fd32ab0de14062eed9aab1247bf356
push id29919
push userbmo:mshal@mozilla.com
push dateTue, 20 Sep 2016 19:25:46 +0000
reviewerschmanchester
bugs1304143
milestone52.0a1
Bug 1304143 - pass --verbose flag to tup when not running 'make -s'; r?chmanchester MozReview-Commit-ID: DWwxQweCMze
Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -168,17 +168,17 @@ ifneq (,$(filter FasterMake+RecursiveMak
 install-manifests: faster
 .PHONY: faster
 faster: install-dist/idl
 	$(MAKE) -C faster FASTER_RECURSIVE_MAKE=1
 endif
 
 .PHONY: tup
 tup: install-manifests buildid.h
-	@$(TUP)
+	@$(TUP) $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),,--verbose)
 
 # process_install_manifest needs to be invoked with --no-remove when building
 # js as standalone because automated builds are building nspr separately and
 # that would remove the resulting files.
 # Eventually, a standalone js build would just be able to build nspr itself,
 # removing the need for the former.
 ifdef JS_STANDALONE
 NO_REMOVE=1