diff options
| author | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-06-29 10:58:30 (GMT) |
|---|---|---|
| committer | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-06-29 10:58:30 (GMT) |
| commit | 8dd2c436317301067f2637829572c36499e24318 (patch) | |
| tree | 7a66d17a0f11bdade02cfc6a1e01fe76eda60fdf | |
| parent | f500d2e6d12d50feec93517c077194adc9a31306 (diff) | |
| download | SCons-8dd2c436317301067f2637829572c36499e24318.zip SCons-8dd2c436317301067f2637829572c36499e24318.tar.gz SCons-8dd2c436317301067f2637829572c36499e24318.tar.bz2 | |
Use msvc version prefix instead of version prefix for internal dictionary lookup.
| -rw-r--r-- | SCons/Tool/MSCommon/MSVC/Config.py | 2 | ||||
| -rw-r--r-- | SCons/Tool/MSCommon/MSVC/ScriptArguments.py | 2 | ||||
| -rw-r--r-- | SCons/Tool/MSCommon/MSVC/WinSDK.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/SCons/Tool/MSCommon/MSVC/Config.py b/SCons/Tool/MSCommon/MSVC/Config.py index 3b71cd8..fa7dbc1 100644 --- a/SCons/Tool/MSCommon/MSVC/Config.py +++ b/SCons/Tool/MSCommon/MSVC/Config.py @@ -318,7 +318,7 @@ for policy_value, policy_symbol_list in [ def verify(): from .. import vc for msvc_version in vc._VCVER: - vc_version = Util.get_version_prefix(msvc_version) + vc_version = Util.get_msvc_version_prefix(msvc_version) if vc_version in MSVC_VERSION_INTERNAL: continue err_msg = 'vc_version {} not in MSVC_VERSION_INTERNAL'.format(repr(vc_version)) diff --git a/SCons/Tool/MSCommon/MSVC/ScriptArguments.py b/SCons/Tool/MSCommon/MSVC/ScriptArguments.py index 556cae8..56a4676 100644 --- a/SCons/Tool/MSCommon/MSVC/ScriptArguments.py +++ b/SCons/Tool/MSCommon/MSVC/ScriptArguments.py @@ -180,7 +180,7 @@ MSVC_VERSION_ARGS_DEFINITION = namedtuple('MSVCVersionArgsDefinition', [ def _msvc_version(version): - verstr = Util.get_version_prefix(version) + verstr = Util.get_msvc_version_prefix(version) vs_def = Config.MSVC_VERSION_INTERNAL[verstr] version_args = MSVC_VERSION_ARGS_DEFINITION( diff --git a/SCons/Tool/MSCommon/MSVC/WinSDK.py b/SCons/Tool/MSCommon/MSVC/WinSDK.py index 42526c2..b17f850 100644 --- a/SCons/Tool/MSCommon/MSVC/WinSDK.py +++ b/SCons/Tool/MSCommon/MSVC/WinSDK.py @@ -235,7 +235,7 @@ def get_msvc_sdk_version_list(msvc_version, msvc_uwp_app=False): sdk_versions = [] - verstr = Util.get_version_prefix(msvc_version) + verstr = Util.get_msvc_version_prefix(msvc_version) vs_def = Config.MSVC_VERSION_EXTERNAL.get(verstr, None) if not vs_def: debug('vs_def is not defined') |