Bug 1561465 - Avoid being too verbose after bug 1560527. r=nalexander
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 26 Jun 2019 02:19:43 +0000
changeset 542960 31e100717641c1b782eba27758c7aa5c95d9e899
parent 542959 741653aeeb8eefc14d670bddb939199694a3001c
child 542961 e1b90a9447631d80213cc550e52fb77eb52053ce
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1561465, 1560527
milestone69.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 1561465 - Avoid being too verbose after bug 1560527. r=nalexander 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
@@ -394,17 +394,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