Check MSVC arm64 variant on arm64 host (#4555)

pypa · Aug 26, 2024 · 4c990b9 · 4c990b9
1 parent 67b35f2
commit 4c990b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/newsfragments/4553.feature.rst b/newsfragments/4553.feature.rst
@@ -0,0 +1 @@
+Added detection of ARM64 variant of MSVC -- by :user:`saschanaz`
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
@@ -26,6 +26,7 @@
 from more_itertools import unique_everseen
 
 import distutils.errors
+from distutils.util import get_platform
 
 # https://github.com/python/mypy/issues/8166
 if not TYPE_CHECKING and platform.system() == 'Windows':
@@ -89,8 +90,9 @@ def _msvc14_find_vc2017():
     if not root:
         return None, None
 
+    variant = 'arm64' if get_platform() == 'win-arm64' else 'x86.x64'
     suitable_components = (
-        "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+        f"Microsoft.VisualStudio.Component.VC.Tools.{variant}",
         "Microsoft.VisualStudio.Workload.WDExpress",
     )