diff options
| author | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-05-04 13:03:26 (GMT) |
|---|---|---|
| committer | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-05-04 13:03:26 (GMT) |
| commit | 7612dd6fdeb6aaea638cb3cb0e7cc3542840b8f2 (patch) | |
| tree | 99f0bd7c23f6fe97a42e594d8ea3dfc87f68ce7b /SCons | |
| parent | bd1474d46429689f441ef2a80bb410d8839aad9a (diff) | |
| download | SCons-7612dd6fdeb6aaea638cb3cb0e7cc3542840b8f2.zip SCons-7612dd6fdeb6aaea638cb3cb0e7cc3542840b8f2.tar.gz SCons-7612dd6fdeb6aaea638cb3cb0e7cc3542840b8f2.tar.bz2 | |
Propagate OS and windir environment variables to msvc batch file environment
Diffstat (limited to 'SCons')
| -rw-r--r-- | SCons/Tool/MSCommon/common.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/SCons/Tool/MSCommon/common.py b/SCons/Tool/MSCommon/common.py index fcf9fa7..bd06ab8 100644 --- a/SCons/Tool/MSCommon/common.py +++ b/SCons/Tool/MSCommon/common.py @@ -243,6 +243,7 @@ def get_output(vcbat, args=None, env=None): # or synced with the the common_tools_var # settings in vs.py. vs_vc_vars = [ 'COMSPEC', # path to "shell" + 'OS', # name of OS family: Windows_NT or undefined (95/98/ME) 'VS170COMNTOOLS', # path to common tools for given version 'VS160COMNTOOLS', 'VS150COMNTOOLS', @@ -257,6 +258,7 @@ def get_output(vcbat, args=None, env=None): 'MSDevDir', 'VSCMD_DEBUG', # enable logging and other debug aids 'VSCMD_SKIP_SENDTELEMETRY', + 'windir', # windows directory (SystemRoot not available in 95/98/ME) ] env['ENV'] = normalize_env(env['ENV'], vs_vc_vars, force=False) |