diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-12-14 10:39:34 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-14 10:39:34 (GMT) |
| commit | 9e7c136ad8bc8e8eec50c2a8ae5ff02752f695a2 (patch) | |
| tree | 6fd4267ccb4e1d41767536779f90d29565f13a87 | |
| parent | 7ea143ae795a9fd57eaccf490d316bdc13ee9065 (diff) | |
| download | cpython-9e7c136ad8bc8e8eec50c2a8ae5ff02752f695a2.zip cpython-9e7c136ad8bc8e8eec50c2a8ae5ff02752f695a2.tar.gz cpython-9e7c136ad8bc8e8eec50c2a8ae5ff02752f695a2.tar.bz2 | |
bpo-32302: Fix distutils bdist_wininst for CRT v142 (#4851)
CRT v142 is binary compatible with CRT v140.
| -rw-r--r-- | Lib/distutils/command/bdist_wininst.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2017-12-13-22-38-08.bpo-32302.othtTr.rst | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py index 6309c3e..83f0073 100644 --- a/Lib/distutils/command/bdist_wininst.py +++ b/Lib/distutils/command/bdist_wininst.py @@ -338,8 +338,8 @@ class bdist_wininst(Command): bv = '14.0' else: bv = '.'.join(CRT_ASSEMBLY_VERSION.split('.', 2)[:2]) - if bv == '14.11': - # v141 and v140 are binary compatible, + if bv in ('14.11', '14.12'): + # v142, v141 and v140 are binary compatible, # so keep using the 14.0 stub. bv = '14.0' diff --git a/Misc/NEWS.d/next/Library/2017-12-13-22-38-08.bpo-32302.othtTr.rst b/Misc/NEWS.d/next/Library/2017-12-13-22-38-08.bpo-32302.othtTr.rst new file mode 100644 index 0000000..abe51f0 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-12-13-22-38-08.bpo-32302.othtTr.rst @@ -0,0 +1,2 @@ +Fix bdist_wininst of distutils for CRT v142: it binary compatible with CRT +v140. |