summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2023-02-06 18:19:22 -0500
committerGitHub <noreply@github.com>2023-02-06 18:19:22 -0500
commit8fe7b5f2eee8a1eea501be3635e6e7af9553db6d (patch)
tree2facc02fc78ae4defd76cea48c33ce5b1df29f0f
parent2f16327060394b21fadb6342ea83eec324512aaa (diff)
parente2264e5d74e6bfea75005fe8c67a31ff670b2bb9 (diff)
downloadpython-setuptools-git-8fe7b5f2eee8a1eea501be3635e6e7af9553db6d.tar.gz
Merge pull request #202 from GalaxySnail/fix-mingw-w64-2
Fix MinGW-w64 segmentation fault (v2)
-rw-r--r--distutils/cygwinccompiler.py2
-rw-r--r--distutils/tests/test_cygwinccompiler.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
index 3125d9dc..47efa377 100644
--- a/distutils/cygwinccompiler.py
+++ b/distutils/cygwinccompiler.py
@@ -43,7 +43,7 @@ _msvcr_lookup = RangeMap.left(
# VS2013 / MSVC 12.0
1800: ['msvcr120'],
# VS2015 / MSVC 14.0
- 1900: ['ucrt', 'vcruntime140'],
+ 1900: ['vcruntime140'],
2000: RangeMap.undefined_value,
},
)
diff --git a/distutils/tests/test_cygwinccompiler.py b/distutils/tests/test_cygwinccompiler.py
index 6c29b743..6fb449a6 100644
--- a/distutils/tests/test_cygwinccompiler.py
+++ b/distutils/tests/test_cygwinccompiler.py
@@ -106,7 +106,7 @@ class TestCygwinCCompiler(support.TempdirManager):
'3.10.0 (tags/v3.10.0:b494f59, Oct 4 2021, 18:46:30) '
'[MSC v.1929 32 bit (Intel)]'
)
- assert get_msvcr() == ['ucrt', 'vcruntime140']
+ assert get_msvcr() == ['vcruntime140']
# unknown
sys.version = (