diff options
| author | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-06-21 01:48:57 (GMT) |
|---|---|---|
| committer | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-06-21 01:48:57 (GMT) |
| commit | f6a7b846bba8477ca8221edd2b76dc3d1d842439 (patch) | |
| tree | e786cf64ba973744a74789ad9427828f921be633 | |
| parent | a7c56cebc24fd5aaa2dd05a1751412120c946835 (diff) | |
| download | SCons-f6a7b846bba8477ca8221edd2b76dc3d1d842439.zip SCons-f6a7b846bba8477ca8221edd2b76dc3d1d842439.tar.gz SCons-f6a7b846bba8477ca8221edd2b76dc3d1d842439.tar.bz2 | |
Add global for cache reset (classmethod to module omission) and remove duplicate import
| -rw-r--r-- | SCons/Tool/MSCommon/MSVC/Registry.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, 4 insertions, 2 deletions
diff --git a/SCons/Tool/MSCommon/MSVC/Registry.py b/SCons/Tool/MSCommon/MSVC/Registry.py index f9a5eb2..492f3d0 100644 --- a/SCons/Tool/MSCommon/MSVC/Registry.py +++ b/SCons/Tool/MSCommon/MSVC/Registry.py @@ -30,8 +30,6 @@ import os from SCons.Util import ( HKEY_LOCAL_MACHINE, HKEY_CURRENT_USER, - HKEY_LOCAL_MACHINE, - HKEY_CURRENT_USER, ) from .. common import ( diff --git a/SCons/Tool/MSCommon/MSVC/ScriptArguments.py b/SCons/Tool/MSCommon/MSVC/ScriptArguments.py index 1b02396..d0fc6ef 100644 --- a/SCons/Tool/MSCommon/MSVC/ScriptArguments.py +++ b/SCons/Tool/MSCommon/MSVC/ScriptArguments.py @@ -373,6 +373,8 @@ _toolset_version_cache = {} _toolset_default_cache = {} def _reset_toolset_cache(): + global _toolset_version_cache + global _toolset_default_cache debug('reset: toolset cache') _toolset_version_cache = {} _toolset_default_cache = {} diff --git a/SCons/Tool/MSCommon/MSVC/WinSDK.py b/SCons/Tool/MSCommon/MSVC/WinSDK.py index bd8d9b0..8338c27 100644 --- a/SCons/Tool/MSCommon/MSVC/WinSDK.py +++ b/SCons/Tool/MSCommon/MSVC/WinSDK.py @@ -152,6 +152,8 @@ _sdk_map_cache = {} _sdk_cache = {} def _reset_sdk_cache(): + global _sdk_map_cache + global _sdk_cache debug('') _sdk_map_cache = {} _sdk_cache = {} |