Mesa (master): darwin: Use the system libunwind

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 766538f83cbbe33ca291feb7ec43cf2937c098da
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=766538f83cbbe33ca291feb7ec43cf2937c098da

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

darwin: Use the system libunwind

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

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8507>

---

 meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 635dfc9169e..96571c9df25 100644
--- a/meson.build
+++ b/meson.build
@@ -1735,7 +1735,11 @@ elif _libunwind == 'false'
   warning('libunwind option "false" deprecated, please use "disabled" instead.')
 endif
 if _libunwind != 'disabled' and not with_platform_android
-  dep_unwind = dependency('libunwind', required : _libunwind == 'enabled')
+  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