[Python-checkins] bpo-38088: Fixes distutils not finding vcruntime140.dll with only v142 toolset installed (GH-15849)

[Steve Dower]

https://github.com/python/cpython/commit/0fccd4ab5b2238b6340901dd0023a1a157852792
commit: 0fccd4ab5b2238b6340901dd0023a1a157852792
branch: 3.7
author: Steve Dower <steve.dower at python.org>
committer: GitHub <noreply at github.com>
date: 2019-09-10T15:18:02+01:00
summary:

bpo-38088: Fixes distutils not finding vcruntime140.dll with only v142 toolset installed (GH-15849)

files:
A Misc/NEWS.d/next/Windows/2019-09-10-14-17-25.bpo-38088.FOvWSM.rst
M Lib/distutils/_msvccompiler.py

diff --git a/Lib/distutils/_msvccompiler.py b/Lib/distutils/_msvccompiler.py
index 58b20a210247..26112b481af3 100644
--- a/Lib/distutils/_msvccompiler.py
+++ b/Lib/distutils/_msvccompiler.py
@@ -95,7 +95,7 @@ def _find_vcvarsall(plat_spec):
     vcruntime_plat = 'x64' if 'amd64' in plat_spec else 'x86'
     if best_dir:
         vcredist = os.path.join(best_dir, "..", "..", "redist", "MSVC", "**",
-            "Microsoft.VC141.CRT", "vcruntime140.dll")
+            vcruntime_plat, "Microsoft.VC14*.CRT", "vcruntime140.dll")
         try:
             import glob
             vcruntime = glob.glob(vcredist, recursive=True)[-1]
diff --git a/Misc/NEWS.d/next/Windows/2019-09-10-14-17-25.bpo-38088.FOvWSM.rst b/Misc/NEWS.d/next/Windows/2019-09-10-14-17-25.bpo-38088.FOvWSM.rst
new file mode 100644
index 000000000000..37bdeeadd894
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2019-09-10-14-17-25.bpo-38088.FOvWSM.rst
@@ -0,0 +1,2 @@
+Fixes distutils not finding vcruntime140.dll with only the v142 toolset
+installed.