summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston Sequoia <jeremyhu@apple.com>2021-01-14 10:08:34 -0800
committerMarge Bot <eric+marge@anholt.net>2021-01-15 20:00:20 +0000
commit766538f83cbbe33ca291feb7ec43cf2937c098da (patch)
tree6e88b41b11744aa1cd3c523a92dfd8632f926277
parent08ac7b52e7814540e92d5add29049324f6841bb5 (diff)
darwin: Use the system libunwind
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4094 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8507>
-rw-r--r--meson.build6
1 files changed, 5 insertions, 1 deletions
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