diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2022-09-27 13:00:48 -0500 |
|---|---|---|
| committer | Daniel Moody <daniel.moody@mongodb.com> | 2022-09-27 13:00:48 -0500 |
| commit | ea030a74ad98ffb48bc68d4918703390c022df32 (patch) | |
| tree | ed53c9d42d9b7b4eb8e8ab322b65bb832f003835 | |
| parent | be60e8d6c6ad9ac938583db103f49706ab8faa27 (diff) | |
| download | mongo-ea030a74ad98ffb48bc68d4918703390c022df32.tar.gz | |
revert c mode on windows
| -rw-r--r-- | SConstruct | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 3d404638650..648a2774fbb 100644 --- a/SConstruct +++ b/SConstruct @@ -2727,7 +2727,7 @@ elif env.TargetOSIs('windows'): # Enables the __cplusplus preprocessor macro to report an updated value for recent C++ language # standards support. - env.Append(CXXFLAGS=["/Zc:__cplusplus"]) + env.Append(CCFLAGS=["/Zc:__cplusplus"]) # Tells the compiler to preferentially call global operator delete or operator delete[] # functions that have a second parameter of type size_t when the size of the object is available. @@ -3681,10 +3681,10 @@ def doConfigure(myenv): if myenv.ToolchainIs('msvc'): if get_option('cxx-std') == "17": - myenv.AppendUnique(CXXFLAGS=['/std:c++17', + myenv.AppendUnique(CCFLAGS=['/std:c++17', '/Zc:lambda']) # /Zc:lambda is implied by /std:c++20 elif get_option('cxx-std') == "20": - myenv.AppendUnique(CXXFLAGS=['/std:c++20']) + myenv.AppendUnique(CCFLAGS=['/std:c++20']) else: if get_option('cxx-std') == "17": if not myenv.AddToCXXFLAGSIfSupported('-std=c++17'): |