bug 1473121 - Pass -vv to cargo build instead of just --verbose when verbose output is requested. r?build draft
authorTed Mielczarek <ted@mielczarek.org>
Tue, 03 Jul 2018 14:17:31 -0400
changeset 814432 d8b152444cd1c01fe9068bc5fea652c04fcd14f3
parent 813581 a0e47ebc4c06e652b919dabee711fdbd6bfd31b5
push id115207
push userbmo:ted@mielczarek.org
push dateThu, 05 Jul 2018 11:03:55 +0000
reviewersbuild
bugs1473121
milestone63.0a1
bug 1473121 - Pass -vv to cargo build instead of just --verbose when verbose output is requested. r?build Many Rust build scripts compile C/C++ source files with the cc crate, but cargo doesn't print the output of build scripts unless you pass `-vv`, so pass that instead of just `--verbose` to get that output in automation and builds where verbose output was requested. MozReview-Commit-ID: EUazlKWFsDw
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -812,20 +812,20 @@ cargo_target_flag := --target=$(RUST_TAR
 cargo_build_flags = $(CARGOFLAGS)
 ifndef MOZ_DEBUG_RUST
 cargo_build_flags += --release
 endif
 cargo_build_flags += --frozen
 
 cargo_build_flags += --manifest-path $(CARGO_FILE)
 ifdef BUILD_VERBOSE_LOG
-cargo_build_flags += --verbose
+cargo_build_flags += -vv
 else
 ifdef MOZ_AUTOMATION
-cargo_build_flags += --verbose
+cargo_build_flags += -vv
 endif # MOZ_AUTOMATION
 endif # BUILD_VERBOSE_LOG
 
 # 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)))