From da8c7ce8edad80efbbf1326decde13cadf55b88a Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 11 Jan 2019 00:20:33 +0000 Subject: [PATCH] Bug 1515528 - Prefer MSVC when building for aarch64 windows. r=froydnj Depends on D15264 Differential Revision: https://phabricator.services.mozilla.com/D15265 --HG-- extra : moz-landing-system : lando --- build/moz.configure/toolchain.configure | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 3de63f237cc3..59547401dc13 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -839,7 +839,11 @@ def default_c_compilers(host_or_target, other_c_compiler=None): def default_c_compilers(host_or_target, target, toolchain_prefix, android_clang_compiler, *other_c_compiler): if host_or_target.kernel == 'WINNT': - supported = types = ('clang-cl', 'msvc', 'gcc', 'clang') + # Prefer MSVC for aarch64 for now. + if host_or_target.cpu == 'aarch64': + supported = types = ('msvc', 'clang-cl', 'gcc', 'clang') + else: + supported = types = ('clang-cl', 'msvc', 'gcc', 'clang') elif host_or_target.kernel == 'Darwin': types = ('clang',) supported = ('clang', 'gcc')