Merge pull request #836 from stonebig/master

stonebig · web-flow · commit 8d25191fcd3f · 2020-04-10T18:39:19.000+02:00
correct 32bit build bug
diff --git a/winpython/disthelpers.py b/winpython/disthelpers.py
@@ -256,7 +256,7 @@ def get_msvc_dlls(msvc_version, architecture=None):
                 'vcomp%s.dll',
             )
         ]
-        if msvc_major == '15':
+        if msvc_major == '15' and architecture == 64:
             namelist = [
                 name % ('14' + msvc_minor)
                 for name in (
@@ -268,6 +268,17 @@ def get_msvc_dlls(msvc_version, architecture=None):
                     'vcomp%s.dll',
                 )
             ]
+        if msvc_major == '15' and architecture != 64:
+            namelist = [
+                name % ('14' + msvc_minor)
+                for name in (
+                    'vcruntime%s.dll',
+                    'msvcp%s.dll',
+                    'vccorlib%s.dll',
+                    'concrt%s.dll',
+                    'vcomp%s.dll',
+                )
+            ]
         windir = os.environ['windir']
         is_64bit_windows = osp.isdir(
             osp.join(windir, "SysWOW64")
