diff options
| author | Andrew Morrow <acm@mongodb.com> | 2019-03-18 10:42:34 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2019-03-18 12:30:35 -0400 |
| commit | 5ab83a702659235ea138c62fca3e608bb1def8cf (patch) | |
| tree | f35454ad60d606f45fadbd404374bb1d7ba8dc96 /SConstruct | |
| parent | df4243e71b7c69c4da59c90e657f0749d6c9c979 (diff) | |
| download | mongo-5ab83a702659235ea138c62fca3e608bb1def8cf.tar.gz | |
Revert "SERVER-36243 Use sized deallocation."
This reverts commit afe082642124dbda2367cb51c3d748873df9bf7b.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index 2963b554a20..adbdf29d1fd 100644 --- a/SConstruct +++ b/SConstruct @@ -2397,15 +2397,12 @@ def doConfigure(myenv): if myenv.ToolchainIs('msvc'): myenv.AppendUnique(CCFLAGS=['/Zc:__cplusplus', '/permissive-']) if get_option('cxx-std') == "17": - myenv.AppendUnique(CCFLAGS=['/std:c++17', '/Zc:sizedDealloc']) + myenv.AppendUnique(CCFLAGS=['/std:c++17']) else: if get_option('cxx-std') == "17": if not AddToCXXFLAGSIfSupported(myenv, '-std=c++17'): myenv.ConfError('Compiler does not honor -std=c++17') - if not AddToCXXFLAGSIfSupported(myenv, '-fsized-deallocation'): - myenv.ConfError('Compiler does not honor -fsized-deallocation') - if not AddToCFLAGSIfSupported(myenv, '-std=c11'): myenv.ConfError("C++14/17 mode selected for C++ files, but can't enable C11 for C files") |