FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 09:57:15 +01:00
Code Issues Projects Releases Wiki Activity

The meaning of filter differs in Python 2/3 - Fixed MSVC builds without lazy for Python 3

Browse Source
This commit is contained in:
Thomas Nagy 2015-09-20 12:03:27 +02:00
parent ef72d4657f
commit dbdc95dfb6
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
waflib/Tools/msvc.py
View File

@ -106,7 +106,6 @@ def setup_msvc(conf, versions, arch = False):
:return: the compiler, revision, path, include dirs, library paths, and (optionally) target architecture
:rtype: tuple of strings
"""
platforms = getattr(Options.options, 'msvc_targets', '').split(',')
if platforms == ['']:
platforms=Utils.to_list(conf.env['MSVC_TARGETS']) or [i for i,j in all_msvc_platforms+all_icl_platforms+all_wince_platforms]
@ -359,7 +358,6 @@ class lazytup(object):
def __init__(self, fn, lazy=True, default=None):
self.fn = fn
self.default = default
if not lazy:
self.evaluate()
def __len__(self):
@ -429,7 +427,6 @@ def gather_wince_targets(conf, versions, version, vc_path, vsvars, supported_pla
cetargets.append((platform, (platform, get_compiler_env(conf, 'msvc', version, 'x86', vsvars, combine_common))))
except conf.errors.ConfigurationError:
continue
if cetargets:
versions.append((device + ' ' + version, cetargets))
@ -613,7 +610,7 @@ def get_msvc_versions(conf, eval_and_save=True):
"""
if conf.env['MSVC_INSTALLED_VERSIONS']:
return conf.env['MSVC_INSTALLED_VERSIONS']
# Gather all the compiler versions and targets. This phase can be lazy
# per lazy detection settings.
lst = []
@ -632,7 +629,7 @@ def get_msvc_versions(conf, eval_and_save=True):
return None
else:
return t
lst = [(version,filter(checked_target, targets)) for version, targets in lst]
lst = [(version, list(filter(checked_target, targets))) for version, targets in lst]
conf.env['MSVC_INSTALLED_VERSIONS'] = lst
return lst