From bfd9f3201e49cd3f46393b7737cd156a69e9f5ab Mon Sep 17 00:00:00 2001 From: Michel Zou Date: Mon, 11 Nov 2019 22:14:55 +0100 Subject: [PATCH] Meson: Check for dladdr with MinGW Reviewed-by: Eric Engestrom --- meson.build | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 39907709f71..69d15649060 100644 --- a/meson.build +++ b/meson.build @@ -1223,14 +1223,12 @@ ld_args_build_id = cc.get_supported_link_arguments('-Wl,--build-id=sha1') # check for dl support 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 +if not cc.has_function('dlopen') + dep_dl = cc.find_library('dl', required : host_machine.system() != 'windows') +endif +if cc.has_function('dladdr', dependencies : dep_dl) + # This is really only required for megadrivers + pre_args += '-DHAVE_DLADDR' endif if cc.has_function('dl_iterate_phdr') -- 2.30.2