diff options
| author | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-07-06 12:37:47 (GMT) |
|---|---|---|
| committer | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-07-06 12:37:47 (GMT) |
| commit | 7c6def09e1741a0cd52f22d018fcf33965df1427 (patch) | |
| tree | f8825dc9d1276a35062a37289e5a7bd04bef7161 | |
| parent | 7a930d9820f6b4d78d4366957bb065b0794f5499 (diff) | |
| download | SCons-7c6def09e1741a0cd52f22d018fcf33965df1427.zip SCons-7c6def09e1741a0cd52f22d018fcf33965df1427.tar.gz SCons-7c6def09e1741a0cd52f22d018fcf33965df1427.tar.bz2 | |
Return full toolset version number for version toolset query function.
| -rw-r--r-- | SCons/Tool/MSCommon/vc.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/SCons/Tool/MSCommon/vc.py b/SCons/Tool/MSCommon/vc.py index e9a62ed..4c4571f 100644 --- a/SCons/Tool/MSCommon/vc.py +++ b/SCons/Tool/MSCommon/vc.py @@ -1471,9 +1471,9 @@ def msvc_query_version_toolset(version, prefer_newest=True): return msvc_version, msvc_toolset_version if force_toolset_msvc_version: - msvc_toolset_version = version_elements_def.vc_version_numstr + query_msvc_toolset_version = version_elements_def.vc_version_numstr else: - msvc_toolset_version = version_elements_def.vc_toolset_numstr + query_msvc_toolset_version = version_elements_def.vc_toolset_numstr if prefer_newest: query_version_list = MSVC.Config.MSVC_VERSION_TOOLSET_SEARCH_MAP[msvc_version] @@ -1502,8 +1502,9 @@ def msvc_query_version_toolset(version, prefer_newest=True): return query_msvc_version, msvc_toolset_version try: - toolset_vcvars = MSVC.ScriptArguments._msvc_toolset_internal(query_msvc_version, msvc_toolset_version, vc_dir) + toolset_vcvars = MSVC.ScriptArguments._msvc_toolset_internal(query_msvc_version, query_msvc_toolset_version, vc_dir) if toolset_vcvars: + msvc_toolset_version = toolset_vcvars debug( 'found: msvc_version=%s, msvc_toolset_version=%s', repr(query_msvc_version), repr(msvc_toolset_version) @@ -1513,6 +1514,8 @@ def msvc_query_version_toolset(version, prefer_newest=True): except MSVCToolsetVersionNotFound: pass + msvc_toolset_version = query_msvc_toolset_version + debug( 'not found: msvc_version=%s, msvc_toolset_version=%s', repr(msvc_version), repr(msvc_toolset_version) |