# HG changeset patch
# User Mike Hommey <mh+mozilla@glandium.org>
# Date 1561515583 0
# Node ID 31e100717641c1b782eba27758c7aa5c95d9e899
# Parent  bf12ec02495cb83ce21fe4326a25ad4331054d79
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

diff --git a/config/config.mk b/config/config.mk
--- a/config/config.mk
+++ b/config/config.mk
@@ -443,17 +443,17 @@ 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
 
 export CL_INCLUDES_PREFIX
 # Make sure that the build system can handle non-ASCII characters
 # in environment variables to prevent it from breking silently on
 # non-English systems.
 export NONASCII
diff --git a/config/rules.mk b/config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -388,17 +388,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