From 4da68b7ba922e1daa5f8ceb852e48a3297d29c70 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Wed, 7 Nov 2018 11:24:29 +0000 Subject: Try to handle ARM64 in detect_windows_arch() Putative changes to handle Windows on ARM64, which can also run x86 code under WOW64 --- mesonbuild/environment.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mesonbuild/environment.py') diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index d18c546..ca8b359 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -136,7 +136,7 @@ def detect_ninja(version='1.5', log=False): def detect_native_windows_arch(): """ - The architecture of Windows itself: x86 or amd64 + The architecture of Windows itself: x86, amd64 or arm64 """ # These env variables are always available. See: # https://msdn.microsoft.com/en-us/library/aa384274(VS.85).aspx @@ -175,7 +175,7 @@ def detect_windows_arch(compilers): """ os_arch = detect_native_windows_arch() - if os_arch != 'amd64': + if os_arch == 'x86': return os_arch # If we're on 64-bit Windows, 32-bit apps can be compiled without # cross-compilation. So if we're doing that, just set the native arch as -- cgit v1.1