diff options
| -rw-r--r-- | SConstruct | 6 | ||||
| -rw-r--r-- | src/third_party/mozjs/SConscript | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 03dfdff4b91..9fd6e0b6db7 100644 --- a/SConstruct +++ b/SConstruct @@ -2100,6 +2100,12 @@ elif env.TargetOSIs('windows'): "_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING", "_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING", "_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING", + + # TODO(SERVER-60151): Until we are fully in C++20 mode, it is + # easier to simply suppress C++20 deprecations. After we have + # switched over we should address any actual deprecated usages + # and then remove this flag. + "_SILENCE_ALL_CXX20_DEPRECATION_WARNINGS", ]) # /EHsc exception handling style for visual studio diff --git a/src/third_party/mozjs/SConscript b/src/third_party/mozjs/SConscript index aa958ce14c0..ba1afcd6793 100644 --- a/src/third_party/mozjs/SConscript +++ b/src/third_party/mozjs/SConscript @@ -68,8 +68,7 @@ if env.TargetOSIs('windows'): # 'operator': unsafe use of type 'type' in operation '/wd4804', - ], - CXXFLAGS=[ + # TODO(SERVER-59417): Override any potentially applied # C++20 switch to unconditionally build in C++17 mode, at # least until MozJS is upgraded to an ESR that can be |