Bug 1340672 - Don't clobber CARGOFLAGS in non-debug builds. r=froydnj
authorRalph Giles <giles@mozilla.com>
Fri, 17 Feb 2017 12:50:29 -0800
changeset 372688 b97189d6853f5061afd00a94e4759a5c51597dc1
parent 372687 90062ca80ac088be6bec73110dfa7bc13366366d
child 372689 1ea8f04d9266aac38ce15de8e29d76a4c5de0793
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
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