diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2018-01-18 22:09:36 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-18 22:09:36 (GMT) |
| commit | 2507e29a9e4e9dcac6eab46546bd3d34a69342ba (patch) | |
| tree | ef70d7947b2af25233400e1496b349caf384a2b4 /Lib/distutils/command/bdist_wininst.py | |
| parent | fa7880604191f81cbdddc191216f7b1e39a74d8d (diff) | |
| download | cpython-2507e29a9e4e9dcac6eab46546bd3d34a69342ba.zip cpython-2507e29a9e4e9dcac6eab46546bd3d34a69342ba.tar.gz cpython-2507e29a9e4e9dcac6eab46546bd3d34a69342ba.tar.bz2 | |
bpo-32588: Move _findvs into its own module and add missing _queue module to installer (#5227)
Diffstat (limited to 'Lib/distutils/command/bdist_wininst.py')
| -rw-r--r-- | Lib/distutils/command/bdist_wininst.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py index 83f0073..0871a4f 100644 --- a/Lib/distutils/command/bdist_wininst.py +++ b/Lib/distutils/command/bdist_wininst.py @@ -337,11 +337,10 @@ class bdist_wininst(Command): # cross-building, so assume the latest version bv = '14.0' else: - bv = '.'.join(CRT_ASSEMBLY_VERSION.split('.', 2)[:2]) - if bv in ('14.11', '14.12'): - # v142, v141 and v140 are binary compatible, - # so keep using the 14.0 stub. - bv = '14.0' + # as far as we know, CRT is binary compatible based on + # the first field, so assume 'x.0' until proven otherwise + major = CRT_ASSEMBLY_VERSION.partition('.')[0] + bv = major + '.0' # wininst-x.y.exe is in the same directory as this file |