diff options
| author | A. Jesse Jiryu Davis <jesse@mongodb.com> | 2019-05-21 23:26:25 -0400 |
|---|---|---|
| committer | A. Jesse Jiryu Davis <jesse@mongodb.com> | 2019-05-31 16:04:51 -0400 |
| commit | a587fc4fe1e0c051b8f534d6c2efad35314a899c (patch) | |
| tree | e1aba51d16999dded4d540d5b2f08d01794c665a /src/third_party/SConscript | |
| parent | 160dbb352cae76307016f42934902d74e7879e5a (diff) | |
| download | mongo-a587fc4fe1e0c051b8f534d6c2efad35314a899c.tar.gz | |
SERVER-26906 Add constexpr function to convert Durations
Diffstat (limited to 'src/third_party/SConscript')
| -rw-r--r-- | src/third_party/SConscript | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/third_party/SConscript b/src/third_party/SConscript index dbb54dda049..ec0f9e29d21 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -27,6 +27,11 @@ thirdPartyEnvironmentModifications = { 's2' : { 'CPPPATH' : ['#src/third_party/s2'], }, + 'safeint' : { + 'CPPPATH' : ['#src/third_party/SafeInt'], + # SAFEINT_USE_INTRINSICS=0 for overflow-safe constexpr multiply. See comment in SafeInt.hpp. + 'CPPDEFINES' : [('SAFEINT_USE_INTRINSICS', 0)], + }, 'timelib' : { 'CPPPATH' : ['#/src/third_party/timelib' + timelibSuffix], } @@ -200,7 +205,7 @@ murmurEnv.SConscript('murmurhash3/SConscript', exports={ 'env' : murmurEnv }) s2Env = env.Clone() -s2Env.InjectThirdParty(libraries=['s2', 'boost', 'abseil-cpp', 'fmt']) +s2Env.InjectThirdParty(libraries=['s2', 'boost', 'abseil-cpp', 'fmt', 'safeint']) s2Env.InjectMongoIncludePaths() s2Env.SConscript('s2/SConscript', exports={'env' : s2Env}) @@ -489,7 +494,7 @@ yamlEnv.Library( 'shim_yaml.cpp', ]) -timelibEnv = env.Clone(); +timelibEnv = env.Clone() timelibEnv.InjectThirdParty(libraries=['timelib']) timelibEnv.SConscript('timelib' + timelibSuffix + '/SConscript', exports={ 'env' : timelibEnv }) timelibEnv = timelibEnv.Clone( |