Skip to content

Commit

Permalink
SERVER-61959 Pull logic from SCons 4.3.0 (and current github scons ma…
Browse files Browse the repository at this point in the history
…ster) to support MSVC 2022

Signed-off-by: Andrew Morrow <acm@mongodb.com>

Closes #1435
  • Loading branch information
bdbaddog authored and Evergreen Agent committed Dec 21, 2021
1 parent 00591f7 commit 0f2088d
Showing 1 changed file with 4 additions and 1 deletion.
Expand Up @@ -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' : [
Expand Down

0 comments on commit 0f2088d

Please sign in to comment.