Merge pull request #202 from GalaxySnail/fix-mingw-w64-2

jaraco · web-flow · commit 8fe7b5f2eee8 · 2023-02-06T18:19:22.000-05:00
Fix MinGW-w64 segmentation fault (v2)
diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
@@ -43,7 +43,7 @@
         # 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
@@ -106,7 +106,7 @@ def test_get_msvcr(self):
             '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 = (

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ def test_get_msvcr(self):`
`106`	`106`	`'3.10.0 (tags/v3.10.0:b494f59, Oct 4 2021, 18:46:30) '`
`107`	`107`	`'[MSC v.1929 32 bit (Intel)]'`
`108`	`108`	`)`
`109`		`- assert get_msvcr() == ['ucrt', 'vcruntime140']`
	`109`	`+ assert get_msvcr() == ['vcruntime140']`
`110`	`110`
`111`	`111`	`# unknown`
`112`	`112`	`sys.version = (`