diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-11-07 11:24:29 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-12-06 13:27:12 +0000 |
| commit | 4da68b7ba922e1daa5f8ceb852e48a3297d29c70 (patch) | |
| tree | 6ed79568a3730087c9336996ea4c25c0b2211235 | |
| parent | f3b5c3c27d03fa03d4ede49a9c3ddeb519c14d17 (diff) | |
| download | meson-4da68b7ba922e1daa5f8ceb852e48a3297d29c70.tar.gz | |
Try to handle ARM64 in detect_windows_arch()
Putative changes to handle Windows on ARM64, which can also run x86 code
under WOW64
| -rw-r--r-- | mesonbuild/environment.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index d18c546f6..ca8b3592e 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 |