From 7b76d432a77ebe9dc1d3dbf733f3fcf8c0a6a1f8 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 7 Feb 2017 12:24:13 +0100 Subject: [PATCH] Do not link with iconv when cross-compilating to windows. Ideally we should check if iconv is present to know if ctpp2 has been build with iconv. This may be a bit too complex for our present case. As we know our cross-compilation environment. It is better to remove the use of iconv everywhere for now. --- meson.build | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index a27e9cd11..4338c730a 100644 --- a/meson.build +++ b/meson.build @@ -21,11 +21,11 @@ if ctpp2_prefix_install == '' ctpp2_lib = find_library('ctpp2') endif link_args = ['-lctpp2'] - if meson.is_cross_build() - if host_machine.system() == 'windows' - link_args += ['-liconv'] - endif - endif +# if meson.is_cross_build() +# if host_machine.system() == 'windows' +# link_args += ['-liconv'] +# endif +# endif ctpp2_dep = declare_dependency(link_args:link_args) else if not find_library_in_compiler @@ -40,11 +40,11 @@ else ctpp2_lib_path = ctpp2_prefix_install+'/lib' ctpp2_lib = compiler.find_library('ctpp2', dirs:ctpp2_lib_path) link_args = ['-L'+ctpp2_lib_path, '-lctpp2'] - if meson.is_cross_build() - if host_machine.system() == 'windows' - link_args += ['-liconv'] - endif - endif +# if meson.is_cross_build() +# if host_machine.system() == 'windows' +# link_args += ['-liconv'] +# endif +# endif ctpp2_dep = declare_dependency(include_directories:ctpp2_include_path, link_args:link_args) endif