mirror of https://gitlab.com/qemu-project/qemu
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: 5285e593c3
(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>
This commit is contained in:
parent
5c53015a48
commit
ac0c8351ab
|
@ -459,7 +459,6 @@ 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) {
|
||||
|
@ -469,7 +468,6 @@ if not get_option('iconv').disabled()
|
|||
iconv = declare_dependency(dependencies: [libiconv])
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
if get_option('iconv').enabled() and not iconv.found()
|
||||
error('Cannot detect iconv API')
|
||||
endif
|
||||
|
|
Loading…
Reference in New Issue