Bug 1304143 - pass --verbose flag to tup when not running 'make -s'; r=chmanchester
authorMike Shal <mshal@mozilla.com>
Mon, 12 Sep 2016 15:09:15 -0400
changeset 314727 d01861ca9927fee8c3a06ed38ca7ef63d180b5b6
parent 314726 2df66e8b7411fa3f7a998f9d87dc967371577c17
child 314728 570eff59efdafea08fbb78a101ac0bbbbef4d504
push id30733
push usercbook@mozilla.com
push dateThu, 22 Sep 2016 09:50:59 +0000
treeherdermozilla-central@4aa20c3e211f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1304143
milestone52.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 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