Bug 1496296 - Stop broadly setting RUSTC_BOOTSTRAP r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 04 Oct 2018 13:51:21 +0000
changeset 488073 b363fee0880d7b029a895baacdb7249520548f8d
parent 488072 b04cf2d0c1fdc6117ea5d35fd68dd53a67585e9b
child 488074 d8d225f8204d0afacc288b12e12a62176ba9aa1c
push id246
push userfmarier@mozilla.com
push dateSat, 13 Oct 2018 00:15:40 +0000
reviewersfroydnj
bugs1496296
milestone64.0a1
Bug 1496296 - Stop broadly setting RUSTC_BOOTSTRAP r=froydnj Depends on D7679 Differential Revision: https://phabricator.services.mozilla.com/D7680
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -895,21 +895,16 @@ ifdef MOZ_MSVCBITS
 environment_cleaner = -u VCINSTALLDIR PATH='' LIB='' LIBPATH=''
 # The servo build needs to know where python is, and we're removing the PATH
 # so we tell it explicitly via the PYTHON env var.
 environment_cleaner += PYTHON='$(shell which $(PYTHON))'
 else
 environment_cleaner =
 endif
 
-rust_unlock_unstable =
-ifdef MOZ_RUST_SIMD
-rust_unlock_unstable += RUSTC_BOOTSTRAP=1
-endif
-
 ifdef MOZ_USING_SCCACHE
 sccache_wrap := RUSTC_WRAPPER='$(CCACHE)'
 endif
 
 ifndef MOZ_ASAN
 ifndef MOZ_TSAN
 ifndef MOZ_UBSAN
 ifndef MOZ_CODE_COVERAGE
@@ -950,17 +945,17 @@ endif # MOZ_CODE_COVERAGE
 endif # MOZ_UBSAN
 endif # MOZ_TSAN
 endif # MOZ_ASAN
 
 # 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) $(sccache_wrap) \
+$(if $(findstring n,$(filter-out --%, $(MAKEFLAGS))),,+)env $(environment_cleaner) $(sccache_wrap) \
 	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
 	RUSTFLAGS='$(2)' \
 	RUSTC=$(RUSTC) \
 	RUSTDOC=$(RUSTDOC) \
 	RUSTFMT=$(RUSTFMT) \
 	$(cargo_c_compiler_envs) \
 	MOZ_SRC=$(topsrcdir) \
 	MOZ_DIST=$(ABS_DIST) \