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.

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

remove hack to handle VS2015-Express #4884

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
15 changes: 3 additions & 12 deletions setuptools/_distutils/compilers/C/msvc.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,26 +206,17 @@ def _get_vcvars_spec(host_platform, platform):
"""
Given a host platform and platform, determine the spec for vcvarsall.

Uses the native MSVC host if the host platform would need expensive
emulation for x86.

>>> _get_vcvars_spec('win-arm64', 'win32')
'arm64_x86'
>>> _get_vcvars_spec('win-arm64', 'win-amd64')
'arm64_amd64'

Otherwise, always cross-compile from x86 to work with the
lighter-weight MSVC installs that do not include native 64-bit tools.

>>> _get_vcvars_spec('win32', 'win32')
'x86'
'x86_x86'
>>> _get_vcvars_spec('win-arm32', 'win-arm32')
'x86_arm'
'arm_arm'
>>> _get_vcvars_spec('win-amd64', 'win-arm64')
'x86_arm64'
'amd64_arm64'
"""
if host_platform != 'win-arm64':
host_platform = 'win32'
vc_hp = _vcvars_names[host_platform]
vc_plat = _vcvars_names[platform]
return vc_hp if vc_hp == vc_plat else f'{vc_hp}_{vc_plat}'
Expand Down