traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-37201: fix test_distutils failures for Windows ARM64 (GH-13902)

This commit is contained in:
Paul Monson 2019-06-12 10:16:49 -07:00 committed by Steve Dower
parent 5287022eee
commit daf6262751
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/distutils/_msvccompiler.py
View File

@ -93,6 +93,7 @@ PLAT_SPEC_TO_RUNTIME = {
'x86' : 'x86', 'x86' : 'x86',
'x86_amd64' : 'x64', 'x86_amd64' : 'x64',
'x86_arm' : 'arm', 'x86_arm' : 'arm',
'x86_arm64' : 'arm64'
} }
def _find_vcvarsall(plat_spec): def _find_vcvarsall(plat_spec):
@ -190,6 +191,7 @@ PLAT_TO_VCVARS = {
'win32' : 'x86', 'win32' : 'x86',
'win-amd64' : 'x86_amd64', 'win-amd64' : 'x86_amd64',
'win-arm32' : 'x86_arm', 'win-arm32' : 'x86_arm',
'win-arm64' : 'x86_arm64'
} }
# A set containing the DLLs that are guaranteed to be available for # A set containing the DLLs that are guaranteed to be available for

4
Lib/distutils/tests/test_bdist_wininst.py
View File

@ -1,10 +1,14 @@
"""Tests for distutils.command.bdist_wininst.""" """Tests for distutils.command.bdist_wininst."""
import sys
import platform
import unittest import unittest
from test.support import run_unittest from test.support import run_unittest
from distutils.command.bdist_wininst import bdist_wininst from distutils.command.bdist_wininst import bdist_wininst
from distutils.tests import support from distutils.tests import support
@unittest.skipIf(sys.platform == 'win32' and platform.machine() == 'ARM64',
'bdist_wininst is not supported in this install')
@unittest.skipIf(getattr(bdist_wininst, '_unsupported', False), @unittest.skipIf(getattr(bdist_wininst, '_unsupported', False),
'bdist_wininst is not supported in this install') 'bdist_wininst is not supported in this install')
class BuildWinInstTestCase(support.TempdirManager, class BuildWinInstTestCase(support.TempdirManager,

2
Lib/distutils/util.py
View File

@ -40,6 +40,8 @@ def get_host_platform():
return 'win-amd64' return 'win-amd64'
if '(arm)' in sys.version.lower(): if '(arm)' in sys.version.lower():
return 'win-arm32' return 'win-arm32'
if '(arm64)' in sys.version.lower():
return 'win-arm64'
return sys.platform return sys.platform
# Set for cross builds explicitly # Set for cross builds explicitly

2
Lib/sysconfig.py
View File

@ -628,6 +628,8 @@ def get_platform():
return 'win-amd64' return 'win-amd64'
if '(arm)' in sys.version.lower(): if '(arm)' in sys.version.lower():
return 'win-arm32' return 'win-arm32'
if '(arm64)' in sys.version.lower():
return 'win-arm64'
return sys.platform return sys.platform
if os.name != "posix" or not hasattr(os, 'uname'): if os.name != "posix" or not hasattr(os, 'uname'):

6
PC/pyconfig.h
View File

@ -122,13 +122,13 @@ WIN32 is still required for the locale module.
#if defined(_M_X64) || defined(_M_AMD64) #if defined(_M_X64) || defined(_M_AMD64)
#if defined(__INTEL_COMPILER) #if defined(__INTEL_COMPILER)
#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 64 bit (amd64) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]") #define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 64 bit (amd64) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")
#elif defined(_M_ARM64)
#define COMPILER _Py_PASTE_VERSION("64 bit (ARM)")
#define PYD_PLATFORM_TAG "win_arm64"
#else #else
#define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)") #define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)")
#endif /* __INTEL_COMPILER */ #endif /* __INTEL_COMPILER */
#define PYD_PLATFORM_TAG "win_amd64" #define PYD_PLATFORM_TAG "win_amd64"
#elif defined(_M_ARM64)
#define COMPILER _Py_PASTE_VERSION("64 bit (ARM64)")
#define PYD_PLATFORM_TAG "win_arm64"
#else #else
#define COMPILER _Py_PASTE_VERSION("64 bit (Unknown)") #define COMPILER _Py_PASTE_VERSION("64 bit (Unknown)")
#endif #endif