diff options
author | Steve Dower <steve.dower@python.org> | 2019-09-10 13:52:23 (GMT) |
---|---|---|
committer | Zachary Ware <zachary.ware@gmail.com> | 2019-09-10 13:52:23 (GMT) |
commit | cd8221152dd235ec5d06e3d9d0d8787645bbac8e (patch) | |
tree | 06a32303b7155a53b29bd042c8f6a139741d74f7 | |
parent | 182e1d1f849757439f2031504f142fa4e1251611 (diff) | |
download | cpython-cd8221152dd235ec5d06e3d9d0d8787645bbac8e.zip cpython-cd8221152dd235ec5d06e3d9d0d8787645bbac8e.tar.gz cpython-cd8221152dd235ec5d06e3d9d0d8787645bbac8e.tar.bz2 |
bpo-38088: Fixes distutils not finding vcruntime140.dll with only v142 toolset installed (GH-15849)
-rw-r--r-- | Lib/distutils/_msvccompiler.py | 2 | ||||
-rw-r--r-- | Misc/NEWS.d/next/Windows/2019-09-10-14-17-25.bpo-38088.FOvWSM.rst | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/distutils/_msvccompiler.py b/Lib/distutils/_msvccompiler.py index 6e14f33..e8e4b71 100644 --- a/Lib/distutils/_msvccompiler.py +++ b/Lib/distutils/_msvccompiler.py @@ -107,7 +107,7 @@ def _find_vcvarsall(plat_spec): if best_dir: vcredist = os.path.join(best_dir, "..", "..", "redist", "MSVC", "**", - vcruntime_plat, "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 0000000..37bdeea --- /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. |