diff options
| author | Henrik Edin <henrik.edin@mongodb.com> | 2019-01-30 16:52:07 -0500 |
|---|---|---|
| committer | Henrik Edin <henrik.edin@mongodb.com> | 2019-02-01 17:06:10 -0500 |
| commit | 66430d75e33827da60195deb317058c71f75e03f (patch) | |
| tree | 8ca6fcca749a630afca95415638052ed429d2e70 /SConstruct | |
| parent | 2dc3359cfe83cafa0f450a0dc7e2815f48ad08b4 (diff) | |
| download | mongo-66430d75e33827da60195deb317058c71f75e03f.tar.gz | |
SERVER-38176 Compile with /permissive- on MSVC to make the compiler strictly standard conformant.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 6697b787ee9..c2ad08211b4 100644 --- a/SConstruct +++ b/SConstruct @@ -1615,8 +1615,9 @@ elif env.TargetOSIs('windows'): # Temporary fixes to allow compilation with VS2017 env.Append(CPPDEFINES=[ - "_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS", - "_SILENCE_FPOS_SEEKPOS_DEPRECATION_WARNING", + "_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING", + "_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING", + "_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING", ]) # /EHsc exception handling style for visual studio @@ -2406,7 +2407,7 @@ def doConfigure(myenv): conf.Finish() if myenv.ToolchainIs('msvc'): - myenv.AppendUnique(CXXFLAGS=['/Zc:__cplusplus']) + myenv.AppendUnique(CCFLAGS=['/Zc:__cplusplus', '/permissive-']) if get_option('cxx-std') == "17": myenv.AppendUnique(CCFLAGS=['/std:c++17']) else: |