Author: Matti Picus <[email protected]>
Branch: msvc-discovery
Changeset: r98034:b00dc8eb081a
Date: 2019-11-12 07:06 -0500
http://bitbucket.org/pypy/pypy/changeset/b00dc8eb081a/
Log: alsways prefer latest version of MSVC
diff --git a/rpython/translator/platform/windows.py
b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/windows.py
+++ b/rpython/translator/platform/windows.py
@@ -65,10 +65,8 @@
log.error('looking for compiler %s raised exception "%s' % (vcver,
str(e)))
return None
-def find_msvc_env(x64flag=False, ver0=None):
+def find_msvc_env(x64flag=False):
vcvers = [150, 140, 141, 90, 100]
- if ver0 in vcvers:
- vcvers.insert(0, ver0)
for vsver in vcvers:
env = _get_msvc_env(vsver, x64flag)
if env is not None:
@@ -124,10 +122,7 @@
patch_os_env(self.externals)
self.c_environ = os.environ.copy()
if cc is None:
- # prefer compiler used to build host. Python2 only
- if ver0 is None:
- ver0 = _get_vcver0()
- msvc_compiler_environ, self.vsver = find_msvc_env(x64, ver0=ver0)
+ msvc_compiler_environ, self.vsver = find_msvc_env(x64)
Platform.__init__(self, 'cl.exe')
if msvc_compiler_environ:
self.c_environ.update(msvc_compiler_environ)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
