Bug 1561465 - Avoid being too verbose after bug 1560527. r=nalexander, a=jcristau
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 26 Jun 2019 02:19:43 +0000
changeset 537098 15ee689ef0fc7022bd205e833b130430a61d8895
parent 537097 56231826b1c88b76e8f808cc517845b9cd8223a7
child 537099 6249480cfc319a863f2bf954d67ef40e26d4158d
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander, jcristau
bugs1561465, 1560527
milestone68.0
Bug 1561465 - Avoid being too verbose after bug 1560527. r=nalexander, a=jcristau Bug 1560527 was not supposed to change verbosity for mach build, but it turns out it did, because the ifeq it copied from one place to another was wrong in the first place. While here, replace a ifeq that did work with the now equivalent BUILD_VERBOSE_LOG. Differential Revision: https://phabricator.services.mozilla.com/D35966
config/config.mk
config/rules.mk
--- a/config/config.mk
+++ b/config/config.mk
@@ -434,11 +434,11 @@ ifndef NO_PROFILE_GUIDED_OPTIMIZE
 OBJ_SUFFIX := i_o
 endif
 endif
 endif
 
 PLY_INCLUDE = -I$(MOZILLA_DIR)/other-licenses/ply
 
 # Enable verbose logs when not using `make -s`
-ifeq (,$(findstring -s, $(filter-out --%, $(MAKEFLAGS))))
+ifeq (,$(findstring s, $(filter-out --%, $(MAKEFLAGS))))
 BUILD_VERBOSE_LOG = 1
 endif
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -416,17 +416,17 @@ endif
 
 # The root makefile doesn't want to do a plain export/libs, because
 # of the tiers and because of libxul. Suppress the default rules in favor
 # of something else. Makefiles which use this var *must* provide a sensible
 # default rule before including rules.mk
 default all::
 	$(foreach tier,$(TIERS),$(call SUBMAKE,$(tier)))
 
-ifeq ($(findstring s,$(filter-out --%, $(MAKEFLAGS))),)
+ifdef BUILD_VERBOSE_LOG
 ECHO := echo
 QUIET :=
 else
 ECHO := true
 QUIET := -q
 endif
 
 # Do everything from scratch