Mesa (master): meson: fix dl detection on non cygwin windows

[GitLab Mirror]

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

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Thu Apr  5 16:12:51 2018 -0700

meson: fix dl detection on non cygwin windows

v4: - Don't run checks on Windows that will always fail

Reviewed-by: Eric Anholt <eric at anholt.net> (v3)
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

---

 meson.build | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/meson.build b/meson.build
index 65afcb4ec60..c700d64eb97 100644
--- a/meson.build
+++ b/meson.build
@@ -1113,14 +1113,15 @@ if build_machine.system() != 'darwin'
 endif
 
 # check for dl support
-if cc.has_function('dlopen')
-  dep_dl = null_dep
-else
-  dep_dl = cc.find_library('dl')
-endif
-if cc.has_function('dladdr', dependencies : dep_dl)
-  # This is really only required for megadrivers
-  pre_args += '-DHAVE_DLADDR'
+dep_dl = null_dep
+if host_machine.system() != 'windows'
+  if not cc.has_function('dlopen')
+    dep_dl = cc.find_library('dl')
+  endif
+  if cc.has_function('dladdr', dependencies : dep_dl)
+    # This is really only required for megadrivers
+    pre_args += '-DHAVE_DLADDR'
+  endif
 endif
 
 if cc.has_function('dl_iterate_phdr')