Bug 1340672 - Don't clobber CARGOFLAGS in non-debug builds. r?froydnj draft
authorRalph Giles <giles@mozilla.com>
Fri, 17 Feb 2017 12:50:29 -0800
changeset 486339 3136f5b5dae16fbe0a38e219d7b81305a33b45de
parent 486287 a8e160dc9aed18b54431fa65ced874619b9230ab
child 546225 52a2aa9fff8739874cdae15e3b875172726b0311
push id45961
push userbmo:giles@thaumas.net
push dateFri, 17 Feb 2017 20:54:10 +0000
reviewersfroydnj
bugs1340672, 1310939
milestone54.0a1
Bug 1340672 - Don't clobber CARGOFLAGS in non-debug builds. r?froydnj Previously, we overrode the CARGOFLAGS when we set --release for non-debug builds. This was an oversight from bug 1310939. MozReview-Commit-ID: LOBkCmxwDzc
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -894,17 +894,17 @@ endif
 
 ifdef MOZ_RUST
 cargo_host_flag := --target=$(RUST_HOST_TARGET)
 cargo_target_flag := --target=$(RUST_TARGET)
 
 # Permit users to pass flags to cargo from their mozconfigs (e.g. --color=always).
 cargo_build_flags = $(CARGOFLAGS)
 ifndef MOZ_DEBUG
-cargo_build_flags = --release
+cargo_build_flags += --release
 endif
 cargo_build_flags += --frozen
 
 cargo_build_flags += --manifest-path $(CARGO_FILE)
 ifdef BUILD_VERBOSE_LOG
 cargo_build_flags += --verbose
 endif