From 0bea4b632e8592dd3afe22116cd53f1a3b5e3234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radek=20Barto=C5=88?= <radek.barton@microsoft.com>
Date: Thu, 4 May 2023 15:35:46 +0200
Subject: Fix building python extensions on win-arm64

---
 mesonbuild/dependencies/python.py | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py
index 4546e8819..24100071e 100644
--- a/mesonbuild/dependencies/python.py
+++ b/mesonbuild/dependencies/python.py
@@ -212,7 +212,7 @@ class PythonSystemDependency(SystemDependency, _PythonDependencyBase):
 
         # https://sourceforge.net/p/mingw-w64/mailman/message/30504611/
         # https://github.com/python/cpython/pull/100137
-        if mesonlib.is_windows() and self.get_windows_python_arch() == '64' and mesonlib.version_compare(self.version, '<3.12'):
+        if mesonlib.is_windows() and self.get_windows_python_arch().endswith('64') and mesonlib.version_compare(self.version, '<3.12'):
             self.compile_args += ['-DMS_WIN64=']
 
         if not self.clib_compiler.has_header('Python.h', '', environment, extra_args=self.compile_args):
@@ -243,16 +243,18 @@ class PythonSystemDependency(SystemDependency, _PythonDependencyBase):
         if self.platform == 'mingw':
             pycc = self.variables.get('CC')
             if pycc.startswith('x86_64'):
-                return '64'
+                return 'x86_64'
             elif pycc.startswith(('i686', 'i386')):
-                return '32'
+                return 'x86'
             else:
                 mlog.log(f'MinGW Python built with unknown CC {pycc!r}, please file a bug')
                 return None
         elif self.platform == 'win32':
-            return '32'
+            return 'x86'
         elif self.platform in {'win64', 'win-amd64'}:
-            return '64'
+            return 'x86_64'
+        elif self.platform in {'win-arm64'}:
+            return 'aarch64'
         mlog.log(f'Unknown Windows Python platform {self.platform!r}')
         return None
 
@@ -324,19 +326,8 @@ class PythonSystemDependency(SystemDependency, _PythonDependencyBase):
             self.is_found = False
             return
         arch = detect_cpu_family(env.coredata.compilers.host)
-        if arch == 'x86':
-            arch = '32'
-        elif arch == 'x86_64':
-            arch = '64'
-        else:
-            # We can't cross-compile Python 3 dependencies on Windows yet
-            mlog.log(f'Unknown architecture {arch!r} for',
-                     mlog.bold(self.name))
-            self.is_found = False
-            return
-        # Pyarch ends in '32' or '64'
         if arch != pyarch:
-            mlog.log('Need', mlog.bold(self.name), f'for {arch}-bit, but found {pyarch}-bit')
+            mlog.log('Need', mlog.bold(self.name), f'for {arch}, but found {pyarch}')
             self.is_found = False
             return
         # This can fail if the library is not found
-- 
cgit v1.2.1