Bug 1483760 Additionally, pass environment variables to cargo if we are not compiling on Windows r=ted
authorTom Ritter <tom@mozilla.com>
Wed, 22 Aug 2018 11:11:11 +0000
changeset 487952 7f64306b8f830ed29d4ee72414449ea67763c242
parent 487951 5874c9b590a03fa983421cc5d74b0b4a8a759351
child 487953 06caf48cb3b5001f8b67b80e6c7c75d306c05b60
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1483760
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1483760 Additionally, pass environment variables to cargo if we are not compiling on Windows r=ted Previously we weren't passing the variables if we were compiling for Windows when really we only want to do it if we're compiling with MSVC/clang-cl. The MinGW-Clang build needs this. Differential Revision: https://phabricator.services.mozilla.com/D3470
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -900,17 +900,17 @@ rust_unlock_unstable =
 ifdef MOZ_RUST_SIMD
 rust_unlock_unstable += RUSTC_BOOTSTRAP=1
 endif
 
 ifdef MOZ_USING_SCCACHE
 sccache_wrap := RUSTC_WRAPPER='$(CCACHE)'
 endif
 
-ifneq (WINNT,$(OS_ARCH))
+ifneq (WINNT,$(HOST_OS_ARCH))
 ifndef MOZ_ASAN
 ifndef MOZ_TSAN
 ifndef MOZ_CODE_COVERAGE
 # Pass the compilers and flags in use to cargo for use in build scripts.
 # * Don't do this on Windows because msys path translation makes a mess of the paths, and
 #   we put MSVC in PATH there anyway.
 # * Don't do this for ASAN/TSAN builds because we don't pass our custom linker (see below)
 #   which will muck things up.