]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-38088: Fixes distutils not finding vcruntime140.dll with only v142 toolset instal...
authorSteve Dower <steve.dower@python.org>
Tue, 10 Sep 2019 14:18:02 +0000 (15:18 +0100)
committerGitHub <noreply@github.com>
Tue, 10 Sep 2019 14:18:02 +0000 (15:18 +0100)
Lib/distutils/_msvccompiler.py
Misc/NEWS.d/next/Windows/2019-09-10-14-17-25.bpo-38088.FOvWSM.rst [new file with mode: 0644]

index 58b20a2102473394a64b627de3339da2e6cc5fe4..26112b481af3d5f7132f7b221eeae4593f6859f7 100644 (file)
@@ -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 (file)
index 0000000..37bdeea
--- /dev/null
@@ -0,0 +1,2 @@
+Fixes distutils not finding vcruntime140.dll with only the v142 toolset
+installed.