Add internal, undocumented SCONS_CACHE_MSVC_FORCE_DEFAULTS environment variable to force default SDK and toolset arguments.

1 files changed, 22 insertions, 0 deletions

diff --git a/SCons/Tool/MSCommon/MSVC/ScriptArguments.py b/SCons/Tool/MSCommon/MSVC/ScriptArguments.py
index a64d9f4..8bef3f5 100644
--- a/SCons/Tool/MSCommon/MSVC/ScriptArguments.py
+++ b/SCons/Tool/MSCommon/MSVC/ScriptArguments.py
@@ -34,6 +34,7 @@ from collections import (
 )
 
 from ..common import (
+    CONFIG_CACHE,
     debug,
 )
 
@@ -50,6 +51,13 @@ from . import Dispatcher
 Dispatcher.register_modulename(__name__)
 
 
+# Force default SDK and toolset arguments in cache
+_SCONS_CACHE_MSVC_FORCE_DEFAULTS = False
+if CONFIG_CACHE:
+    # SCONS_CACHE_MSVC_FORCE_DEFAULTS is internal and not documented.
+    if os.environ.get('SCONS_CACHE_MSVC_FORCE_DEFAULTS') in Config.BOOLEAN_SYMBOLS[True]:
+        _SCONS_CACHE_MSVC_FORCE_DEFAULTS = True
+
 # MSVC_UWP_APP argument: boolean True
 _UWP_ARGUMENT_BOOLEAN_TRUE = (True, '1')
 
@@ -99,6 +107,20 @@ _MSVC_FORCE_DEFAULT_SDK = False
 # Force default toolset argument
 _MSVC_FORCE_DEFAULT_TOOLSET = False
 
+def _msvc_force_default_sdk(force=True):
+    global _MSVC_FORCE_DEFAULT_SDK
+    _MSVC_FORCE_DEFAULT_SDK = force
+    debug('_MSVC_FORCE_DEFAULT_SDK=%s', repr(force))
+
+def _msvc_force_default_toolset(force=True):
+    global _MSVC_FORCE_DEFAULT_TOOLSET
+    _MSVC_FORCE_DEFAULT_TOOLSET = force
+    debug('_MSVC_FORCE_DEFAULT_TOOLSET=%s', repr(force))
+
+if _SCONS_CACHE_MSVC_FORCE_DEFAULTS:
+    _msvc_force_default_sdk(True)
+    _msvc_force_default_toolset(True)
+
 # MSVC batch file arguments:
 #
 #     VS2022: UWP, SDK, TOOLSET, SPECTRE