Bug 1381955 - Don't override RUSTFLAGS to set rust's debuginfo; r?ted draft
authorTom Prince <mozilla@hocat.ca>
Mon, 17 Jul 2017 17:13:19 -0600
changeset 611008 d72221f109a656e5dc3c26e1f083f26952805a81
parent 610536 8ff4f17b266db9a780efe06f7fbdae629e49f5bc
child 638041 282c024fcba8d22a66114a668a9a21e12323edc9
push id69093
push userbmo:mozilla@hocat.ca
push dateWed, 19 Jul 2017 04:30:54 +0000
reviewersted
bugs1381955
milestone56.0a1
Bug 1381955 - Don't override RUSTFLAGS to set rust's debuginfo; r?ted MozReview-Commit-ID: HevATvXusvE
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -903,29 +903,28 @@ rust_unlock_unstable += RUSTC_BOOTSTRAP=
 endif
 
 ifdef MOZ_USING_SCCACHE
 sccache_wrap := RUSTC_WRAPPER='$(CCACHE)'
 endif
 
 # XXX hack to work around dsymutil failing on cross-OSX builds (bug 1380381)
 ifeq ($(HOST_OS_ARCH)-$(OS_ARCH),Linux-Darwin)
-rust_debug_info=1
+default_rustflags += -C debuginfo=1
 else
-rust_debug_info=2
+default_rustflags += -C debuginfo=2
 endif
 
 # We use the + prefix to pass down the jobserver fds to cargo, but we
 # don't use the prefix when make -n is used, so that cargo doesn't run
 # in that case)
 define RUN_CARGO
 $(if $(findstring n,$(filter-out --%, $(MAKEFLAGS))),,+)env $(environment_cleaner) $(rust_unlock_unstable) $(rustflags_override) $(sccache_wrap) \
 	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
 	RUSTC=$(RUSTC) \
-	RUSTFLAGS='-C debuginfo=$(rust_debug_info)' \
 	MOZ_SRC=$(topsrcdir) \
 	MOZ_DIST=$(ABS_DIST) \
 	LIBCLANG_PATH="$(MOZ_LIBCLANG_PATH)" \
 	CLANG_PATH="$(MOZ_CLANG_PATH)" \
 	PKG_CONFIG_ALLOW_CROSS=1 \
 	RUST_BACKTRACE=1 \
 	MOZ_TOPOBJDIR=$(topobjdir) \
 	$(2) \