Mesa (4094-libunwind-not-located-used-on-macos): darwin: Use the system libunwind

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jan 14 18:20:31 UTC 2021


Module: Mesa
Branch: 4094-libunwind-not-located-used-on-macos
Commit: a4917b19aa326526642d25de9208db61f7ca3d19
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a4917b19aa326526642d25de9208db61f7ca3d19

Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Thu Jan 14 10:08:34 2021 -0800

darwin: Use the system libunwind

https://gitlab.freedesktop.org/mesa/mesa/-/issues/4094

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

---

 meson.build | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meson.build b/meson.build
index 932eb136681..f88f978f04c 100644
--- a/meson.build
+++ b/meson.build
@@ -1733,7 +1733,11 @@ elif _libunwind == 'false'
   warning('libunwind option "false" deprecated, please use "disabled" instead.')
 endif
 if _libunwind != 'disabled' and not with_platform_android
+if host_machine.system() == 'darwin'
+  dep_unwind = meson.get_compiler('c').find_library('System')
+else
   dep_unwind = dependency('libunwind', required : _libunwind == 'enabled')
+endif
   if dep_unwind.found()
     pre_args += '-DHAVE_LIBUNWIND'
   endif



More information about the mesa-commit mailing list