diff options
| author | William Deegan <bill@baddogconsulting.com> | 2021-12-21 14:54:42 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-12-21 20:55:57 +0000 |
| commit | 0f2088d744f97b1dda122343b81156851db69c98 (patch) | |
| tree | 60fa1ebe4645f403da4379eefd6c355743599ba0 | |
| parent | 00591f7a441e452d70af288a4376272a52fcd638 (diff) | |
| download | mongo-0f2088d744f97b1dda122343b81156851db69c98.tar.gz | |
SERVER-61959 Pull logic from SCons 4.3.0 (and current github scons master) to support MSVC 2022
Signed-off-by: Andrew Morrow <acm@mongodb.com>
Closes https://github.com/mongodb/mongo/pull/1435
| -rw-r--r-- | src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/vc.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/vc.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/vc.py index 6d0a7ecd999..101bc52eaf2 100644 --- a/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/vc.py +++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/vc.py @@ -194,15 +194,18 @@ def get_host_target(env): # If you update this, update SupportedVSList in Tool/MSCommon/vs.py, and the # MSVC_VERSION documentation in Tool/msvc.xml. -_VCVER = ["14.2", "14.1", "14.0", "14.0Exp", "12.0", "12.0Exp", "11.0", "11.0Exp", "10.0", "10.0Exp", "9.0", "9.0Exp","8.0", "8.0Exp","7.1", "7.0", "6.0"] +_VCVER = ["14.3", "14.2", "14.1", "14.0", "14.0Exp", "12.0", "12.0Exp", "11.0", "11.0Exp", "10.0", "10.0Exp", "9.0", "9.0Exp","8.0", "8.0Exp","7.1", "7.0", "6.0"] # if using vswhere, a further mapping is needed _VCVER_TO_VSWHERE_VER = { + '14.3': '[17.0, 18.0)', '14.2' : '[16.0, 17.0)', '14.1' : '[15.0, 16.0)', } _VCVER_TO_PRODUCT_DIR = { + '14.3': [ + (SCons.Util.HKEY_LOCAL_MACHINE, r'')], # not set by this version '14.2' : [ (SCons.Util.HKEY_LOCAL_MACHINE, r'')], # VS 2019 doesn't set this key '14.1' : [ |