Mesa (4093-meson-fails-to-locate-libexpat-on-macos): darwin: Use the system libexpat

[GitLab Mirror]

Module: Mesa
Branch: 4093-meson-fails-to-locate-libexpat-on-macos
Commit: 3332007566d4f995c1656df7f89e3459b33b9333
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3332007566d4f995c1656df7f89e3459b33b9333

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

darwin: Use the system libexpat

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

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

---

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

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