Bug 1520516 - Set verbose logging for cargo when -v is passed to |./mach build|. r=nalexander
authorChris Manchester <cmanchester@mozilla.com>
Fri, 18 Jan 2019 19:03:24 +0000
changeset 514469 69a1d3aa522d8db9063ffc12966b666583a49764
parent 514468 e3d901befdc1ee6acc2e176ce192fd1cfc6258e3
child 514470 381457de43c0f594595212e74897fba9f60a63d6
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1520516
milestone66.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 1520516 - Set verbose logging for cargo when -v is passed to |./mach build|. r=nalexander Differential Revision: https://phabricator.services.mozilla.com/D16907
config/rules.mk
python/mozbuild/mozbuild/base.py
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -830,21 +830,17 @@ endif
 # touch the lock file.
 ifndef JS_STANDALONE
 cargo_build_flags += --frozen
 endif
 
 cargo_build_flags += --manifest-path $(CARGO_FILE)
 ifdef BUILD_VERBOSE_LOG
 cargo_build_flags += -vv
-else
-ifdef MOZ_AUTOMATION
-cargo_build_flags += -vv
-endif # MOZ_AUTOMATION
-endif # BUILD_VERBOSE_LOG
+endif
 
 # Enable color output if original stdout was a TTY and color settings
 # aren't already present. This essentially restores the default behavior
 # of cargo when running via `mach`.
 ifdef MACH_STDOUT_ISATTY
 ifeq (,$(findstring --color,$(cargo_build_flags)))
 cargo_build_flags += --color=always
 endif
--- a/python/mozbuild/mozbuild/base.py
+++ b/python/mozbuild/mozbuild/base.py
@@ -644,16 +644,18 @@ class MozbuildObject(ProcessExecutionMix
         elif num_jobs > 0:
             args.append('MOZ_PARALLEL_BUILD=%d' % num_jobs)
 
         if ignore_errors:
             args.append('-k')
 
         if silent:
             args.append('-s')
+        else:
+            args.append('BUILD_VERBOSE_LOG=1')
 
         # Print entering/leaving directory messages. Some consumers look at
         # these to measure progress.
         if print_directory:
             args.append('-w')
 
         if keep_going:
             args.append('-k')