diff options
| author | Bruce Rogers <brogers@suse.com> | 2020-10-14 16:19:39 -0600 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-17 10:45:51 -0400 |
| commit | ac0c8351abf79f3b65105ea27bd0491387d804f6 (patch) | |
| tree | c0833036368dcce29c9f9e83b1c73968a00f36f1 | |
| parent | 5c53015a480b3fe137ebd8b3b584a595c65e8f21 (diff) | |
meson.build: don't condition iconv detection on library detection
It isn't necessarily the case that use of iconv requires an additional
library. For that reason we shouldn't conditionalize iconv detection on
libiconv.found.
Fixes: 5285e593c33 (configure: Fixes ncursesw detection under msys2/mingw by convert them to meson)
Signed-off-by: Bruce Rogers <brogers@suse.com>
Reviewed-by: Yonggang Luo<l <brogers@suse.com>uoyonggang@gmail.com>
Reviewed-by:Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20201014221939.196958-1-brogers@suse.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | meson.build | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/meson.build b/meson.build index 0c0f4f9fd8..c1c45e9845 100644 --- a/meson.build +++ b/meson.build @@ -459,15 +459,13 @@ if not get_option('iconv').disabled() libiconv = cc.find_library('iconv', required: false, static: enable_static) - if libiconv.found() - if cc.links(''' - #include <iconv.h> - int main(void) { - iconv_t conv = iconv_open("WCHAR_T", "UCS-2"); - return conv != (iconv_t) -1; - }''', dependencies: [libiconv]) - iconv = declare_dependency(dependencies: [libiconv]) - endif + if cc.links(''' + #include <iconv.h> + int main(void) { + iconv_t conv = iconv_open("WCHAR_T", "UCS-2"); + return conv != (iconv_t) -1; + }''', dependencies: [libiconv]) + iconv = declare_dependency(dependencies: [libiconv]) endif endif if get_option('iconv').enabled() and not iconv.found() |