diff options
| author | Andrew Morrow <acm@mongodb.com> | 2022-05-25 14:00:15 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-05-26 19:34:29 +0000 |
| commit | 13389dc222fc372442be8c147e09685bb9a26a3a (patch) | |
| tree | ea0a71cb7c819cfeef95368fa01b2742c59c972e /SConstruct | |
| parent | 0cc2ede603fd954224356ea2bde2cad8bea65afa (diff) | |
| download | mongo-13389dc222fc372442be8c147e09685bb9a26a3a.tar.gz | |
SERVER-60440 Upgrade boost to 1.79.0
- Reapply the fix for SERVER-46008 for boost 1.79.0
- Reapply the slist fix from SERVER-44079 to boost 1.79.0
- Reapply the fix from SERVER-55204 to boost 1.79.0
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index ce5366be543..e7017034252 100644 --- a/SConstruct +++ b/SConstruct @@ -4710,15 +4710,19 @@ def doConfigure(myenv): conf.FindSysLibDep("wiredtiger", ["wiredtiger"]) conf.env.Append(CPPDEFINES=[ - ("BOOST_THREAD_VERSION", "5"), - "BOOST_THREAD_USES_DATETIME", - "BOOST_SYSTEM_NO_DEPRECATED", - "BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS", + "ABSL_FORCE_ALIGNED_ACCESS", "BOOST_ENABLE_ASSERT_DEBUG_HANDLER", + # TODO: Ideally, we could not set this define in C++20 + # builds, but at least our current Xcode 12 doesn't offer + # std::atomic_ref, so we cannot. + "BOOST_FILESYSTEM_NO_CXX20_ATOMIC_REF", "BOOST_LOG_NO_SHORTHAND_NAMES", "BOOST_LOG_USE_NATIVE_SYSLOG", "BOOST_LOG_WITHOUT_THREAD_ATTR", - "ABSL_FORCE_ALIGNED_ACCESS", + "BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS", + "BOOST_SYSTEM_NO_DEPRECATED", + "BOOST_THREAD_USES_DATETIME", + ("BOOST_THREAD_VERSION", "5"), ]) if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk': |