Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check MSVC arm64 variant on arm64 host #4555

Merged
merged 8 commits into from
Aug 26, 2024
Merged

Check MSVC arm64 variant on arm64 host #4555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dab2b03
Check MSVC arm64 variant too
saschanaz Aug 10, 2024
938fabf
conditional selector
saschanaz Aug 14, 2024
c5825c0
Merge branch 'main' into msvc-aarch64
saschanaz Aug 14, 2024
12fe9f7
Update msvc.py
saschanaz Aug 14, 2024
102b401
Merge branch 'main' into msvc-aarch64
saschanaz Aug 15, 2024
f9c669d
use distutils.util.get_platform
saschanaz Aug 24, 2024
374130e
Merge remote-tracking branch 'upstream/main' into msvc-aarch64
saschanaz Aug 24, 2024
bf9f2ac
Merge branch 'msvc-aarch64' of https://github.com/saschanaz/setuptool…
saschanaz Aug 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions newsfragments/4553.feature.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added detection of ARM64 variant of MSVC -- by :user:`saschanaz`
4 changes: 3 additions & 1 deletion setuptools/msvc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down Expand Up @@ -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",
)

Expand Down
Loading