diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2022-03-12 04:27:58 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-05-18 05:23:03 +0000 |
| commit | 1a5a5989af161da4baf52ef57e7218b7a42a675a (patch) | |
| tree | 97c14125b1a13d645e1731743edb96fea6edc130 /SConstruct | |
| parent | 6f7dae919422dcd7f4892c10ff20cdc721ad00e6 (diff) | |
| download | mongo-1a5a5989af161da4baf52ef57e7218b7a42a675a.tar.gz | |
SERVER-61856 SERVER-42470 update libunwind to 1.6.2
(cherry picked from commit 6dd404e028547a29c21b047c2d91ed90ebb1edfb)
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 17c47b8deb1..10c9f999acb 100644 --- a/SConstruct +++ b/SConstruct @@ -1571,7 +1571,7 @@ use_system_libunwind = use_system_version_of_library("libunwind") # Assume system libunwind works if it's installed and selected. # Vendored libunwind, however, works only on linux-x86_64. can_use_libunwind = (use_system_libunwind or - env.TargetOSIs('linux') and env['TARGET_ARCH'] == 'x86_64') + env.TargetOSIs('linux') and (env['TARGET_ARCH'] == 'x86_64' or env['TARGET_ARCH'] == 'aarch64')) if use_libunwind == "off": use_libunwind = False @@ -4073,7 +4073,7 @@ def doConfigure(myenv): conf.FindSysLibDep("unwind", ["unwind"]) if use_libunwind: - if not conf.CheckLib("lzma"): + if not conf.FindSysLibDep("lzma", ["lzma"]): myenv.ConfError("Cannot find system library 'lzma' required for use with libunwind") if use_system_version_of_library("intel_decimal128"): |