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.
This commit is contained in:
Nathan Froyd 2018-11-20 19:32:47 -05:00
parent 1adaed9c9a
commit f77d1d7a18

View File

@ -330,7 +330,8 @@ def win64_cargo_linker(target, rustc_info, compiler_info, link, lib):
# 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