From 0caa229dcb52d0da14bb45b29781fb781e723d68 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 5 Apr 2018 16:12:51 -0700 Subject: [PATCH] meson: fix dl detection on non cygwin windows v4: - Don't run checks on Windows that will always fail Reviewed-by: Eric Anholt (v3) Reviewed-by: Eric Engestrom --- 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') -- 2.30.2