diff options
| author | Billy Donahue <billy.donahue@mongodb.com> | 2020-01-24 22:20:23 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-05 21:00:41 +0000 |
| commit | 969151e9ab69dcb53397cf40f810e718421db081 (patch) | |
| tree | eb7d4cd83e4c70df67d87847b6e269f05bd75929 /src/third_party | |
| parent | 2985a71befe421902b5d15e9567e3b449e65ecdd (diff) | |
| download | mongo-969151e9ab69dcb53397cf40f810e718421db081.tar.gz | |
SERVER-45677 libunwind on by default where possible
- SCons configure to probe for libunwind support
- gracefully handle SIGUSR2 without libunwind
- integrate libunwind on-by-default (linux-x86_64) into evergreen
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/SConscript | 4 | ||||
| -rw-r--r-- | src/third_party/unwind/SConscript | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/third_party/SConscript b/src/third_party/SConscript index 840c1c96601..951e100b958 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -185,12 +185,12 @@ if not use_system_version_of_library('kms-message'): if use_system_libunwind: thirdPartyEnvironmentModifications['unwind'] = { - 'CPPDEFINES' : ['MONGO_USE_LIBUNWIND', 'UNW_LOCAL_ONLY'], + 'CPPDEFINES' : ['UNW_LOCAL_ONLY'], 'SYSLIBDEPS' : [env['LIBDEPS_UNWIND_SYSLIBDEP'], 'lzma'], } elif use_vendored_libunwind: thirdPartyEnvironmentModifications['unwind'] = { - 'CPPDEFINES' : ['MONGO_USE_LIBUNWIND', 'UNW_LOCAL_ONLY'], + 'CPPDEFINES' : ['UNW_LOCAL_ONLY'], 'LIBDEPS' : ['$BUILD_DIR/third_party/shim_unwind'], 'SYSLIBDEPS' : ['lzma'], } diff --git a/src/third_party/unwind/SConscript b/src/third_party/unwind/SConscript index 6b4ca0488ac..c425cdc2195 100644 --- a/src/third_party/unwind/SConscript +++ b/src/third_party/unwind/SConscript @@ -110,7 +110,7 @@ env.Append( # propagates to consumers that Inject (depend on) unwind. env.RegisterConsumerModifications( CPPPATH=[unwind_platform.Dir("install/include")], - CPPDEFINES=['UNW_LOCAL_ONLY', 'MONGO_USE_LIBUNWIND'], + CPPDEFINES=['UNW_LOCAL_ONLY'], LIBS=['lzma']) env.Append( |