Bug 1503366 - part 2 - enable WIN64_* for cargo in aarch64 cross-compiles; r=chmanchester
authorNathan Froyd <froydnj@mozilla.com>
Tue, 20 Nov 2018 19:32:47 -0500
changeset 447411 3ef1c065654f078be57d52911cf35fc5c6a7a088
parent 447410 5811255ebed472776307973f7accb779fbf00028
child 447412 2526f6735ef5ff8f575b80a56dc2505c4cfac9f0
push id35076
push usershindli@mozilla.com
push dateWed, 21 Nov 2018 04:05:31 +0000
treeherdermozilla-central@50785e9ffd05 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1503366
milestone65.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 1503366 - part 2 - enable WIN64_* for cargo in aarch64 cross-compiles; r=chmanchester We need these bits for generic cross-compiles, so make sure they are enabled on both x86 and aarch64.
build/moz.configure/rust.configure
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -325,17 +325,18 @@ set_config('WIN64_LIB', depends('WIN64_L
 
 
 @depends(target, rustc_info, c_compiler, 'WIN64_LINK', 'WIN64_LIB')
 def win64_cargo_linker(target, rustc_info, compiler_info, link, lib):
     # When we're building a 32-bit Windows build with a 64-bit rustc, we
     # need to configure the linker it will use for host binaries (build scripts)
     # specially because the compiler configuration we use for the build is for
     # MSVC targeting 32-bit binaries.
-    if target.kernel == 'WINNT' and target.cpu == 'x86' and \
+    if target.kernel == 'WINNT' and \
+       target.cpu in ('x86', 'aarch64') and \
        compiler_info.type in ('msvc', 'clang-cl') and \
        rustc_info.host == 'x86_64-pc-windows-msvc' and link and lib:
         return True
 
 
 set_config('WIN64_CARGO_LINKER', win64_cargo_linker)