Skip to content

setuptools.msvc: set host_dir correctly on ARM64 hosts #4786

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

Merged
jaraco merged 5 commits into from
Mar 16, 2025
+13 −3
Merged

setuptools.msvc: set host_dir correctly on ARM64 hosts #4786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e1d81b8
setuptools.msvc: set host_dir correctly on ARM64 hosts
swt2c Jan 5, 2025
0a4f350
Add test capturing missed expectation.
jaraco Mar 16, 2025
d69bf04
Merge failing test into fix_msvc_host_dir_arm64.
jaraco Mar 16, 2025
3218d66
Calculate host_id in one expression.
jaraco Mar 16, 2025
5b66977
Add news fragment.
jaraco Mar 16, 2025
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/4786.feature.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
In setuptools.msvc.EnvironmentInfo, now honor the correct paths when on an ARM host.
15 changes: 12 additions & 3 deletions setuptools/msvc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,6 +1024,16 @@ def VCTools(self):
------
list of str
paths

When host CPU is ARM, the tools should be found for ARM.

>>> getfixture('windows_only')
>>> mp = getfixture('monkeypatch')
>>> mp.setattr(PlatformInfo, 'current_cpu', 'arm64')
>>> ei = EnvironmentInfo(arch='irrelevant')
>>> paths = ei.VCTools
>>> any('HostARM64' in path for path in paths)
True
"""
si = self.si
tools = [os.path.join(si.VCInstallDir, 'VCPackages')]
Expand All @@ -1038,9 +1048,8 @@ def VCTools(self):
tools += [os.path.join(si.VCInstallDir, path)]

elif self.vs_ver >= 15.0:
host_dir = (
r'bin\HostX86%s' if self.pi.current_is_x86() else r'bin\HostX64%s'
)
host_id = self.pi.current_cpu.replace('amd64', 'x64').upper()
host_dir = os.path.join('bin', f'Host{host_id}%s')
tools += [
os.path.join(si.VCInstallDir, host_dir % self.pi.target_dir(x64=True))
]
Expand Down
Loading