From 1ea6981cd60ebdfd7d1bc44c59a5129e53014e6f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 2 Mar 2022 04:46:22 +0200 Subject: [PATCH 42/42] Meson: Add cross paths support to iconv detection See osdn #43919 Signed-off-by: Marko Lindqvist --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 2002c829c2..1711f1b897 100644 --- a/meson.build +++ b/meson.build @@ -328,12 +328,12 @@ int main(void) { struct ip_mreqn req; req.imr_ifindex = 0; return 0; }''') priv_conf_data.set('HAVE_IP_MREQN', 1) endif -if c_compiler.has_function('iconv') +if c_compiler.has_function('iconv', args: header_arg) priv_conf_data.set('HAVE_ICONV', 1) iconv_lib_dep = [] -elif c_compiler.has_header_symbol('iconv.h', 'iconv') +elif c_compiler.has_header_symbol('iconv.h', 'iconv', args: header_arg) priv_conf_data.set('HAVE_ICONV', 1) - iconv_lib_dep = c_compiler.find_library('iconv') + iconv_lib_dep = c_compiler.find_library('iconv', dirs: cross_lib_path) else iconv_lib_dep = [] endif -- 2.34.1