v4: - Don't run checks on Windows that will always fail Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Reviewed-by: Eric Anholt <e...@anholt.net> (v3) Reviewed-by: Eric Engestrom <eric.engest...@intel.com> --- meson.build | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/meson.build b/meson.build index 9298c5ecce6..a5cb5be226c 100644 --- a/meson.build +++ b/meson.build @@ -1030,14 +1030,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.18.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev