summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston Sequoia <jeremyhu@apple.com>2021-01-14 10:08:07 -0800
committerJeremy Huddleston Sequoia <jeremyhu@apple.com>2021-01-14 10:09:49 -0800
commit3332007566d4f995c1656df7f89e3459b33b9333 (patch)
tree0674e15eaea918ee97e71a1bba6ef76770b6ad5e
parenta5bd2b95ef61763e00b462eb8c4de981f3c3931d (diff)
downloadmesa-4093-meson-fails-to-locate-libexpat-on-macos.tar.gz
darwin: Use the system libexpat4093-meson-fails-to-locate-libexpat-on-macos
https://gitlab.freedesktop.org/mesa/mesa/-/issues/4093 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-rw-r--r--meson.build4
1 files changed, 3 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 932eb136681..a5892b7be19 100644
--- a/meson.build
+++ b/meson.build
@@ -1408,7 +1408,9 @@ if dep_thread.found() and host_machine.system() != 'windows'
pre_args += '-DHAVE_PTHREAD_SETAFFINITY'
endif
endif
-if host_machine.system() != 'windows'
+if host_machine.system() == 'darwin'
+ dep_expat = meson.get_compiler('c').find_library('expat')
+elif host_machine.system() != 'windows' and host_machine.system() != 'darwin'
dep_expat = dependency('expat', fallback : ['expat', 'expat_dep'],
required: not with_platform_android or with_any_broadcom or with_any_intel)
else