summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--SConstruct4
-rw-r--r--site_scons/libdeps_next.py9
2 files changed, 9 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index a92d0d68090..cf4dc21742d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -3685,6 +3685,10 @@ def doConfigure(myenv):
if use_system_version_of_library("libunwind"):
conf.FindSysLibDep("unwind", ["unwind"])
+ if use_libunwind:
+ if not conf.CheckLib("lzma"):
+ myenv.ConfError("Cannot find system library 'lzma' required for use with libunwind")
+
if use_system_version_of_library("intel_decimal128"):
conf.FindSysLibDep("intel_decimal128", ["bid"])
diff --git a/site_scons/libdeps_next.py b/site_scons/libdeps_next.py
index ae3dbe9ae5b..51a8376ab3c 100644
--- a/site_scons/libdeps_next.py
+++ b/site_scons/libdeps_next.py
@@ -732,10 +732,11 @@ def make_get_syslibdeps_callable(shared):
continue
if isinstance(syslib, str) and syslib.startswith(Constants.MissingLibdep):
- MissingSyslibdepError(textwrap.dedent(f"""\
- Target '{str(target[0])}' depends on the availability of a
- system provided library for '{syslib[len(Constants.MissingLibdep):]}',
- but no suitable library was found during configuration."""
+ raise MissingSyslibdepError(textwrap.dedent(f"""\
+ LibdepsError:
+ Target '{str(target[0])}' depends on the availability of a
+ system provided library for '{syslib[len(Constants.MissingLibdep):]}',
+ but no suitable library was found during configuration."""
))
deps.append(syslib)