| Message ID | 20211115142915.3797652-5-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | current state of for-6.2/misc-fixes | expand |
On 11/15/21 3:29 PM, Alex Bennée wrote: > From: Paolo Bonzini<pbonzini@redhat.com> > > dlopen is never used after it is sought via cc.find_library, because > plugins use gmodule instead; remove the test. > > Signed-off-by: Paolo Bonzini<pbonzini@redhat.com> > Reviewed-by: Thomas Huth<thuth@redhat.com> > Message-Id:<20211110092454.30916-1-pbonzini@redhat.com> > Signed-off-by: Alex Bennée<alex.bennee@linaro.org> > --- > meson.build | 8 +------- > accel/tcg/meson.build | 2 +- > 2 files changed, 2 insertions(+), 8 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/meson.build b/meson.build index 2ece4fe088..baeaee4522 100644 --- a/meson.build +++ b/meson.build @@ -566,13 +566,7 @@ endif spice_headers = spice.partial_dependency(compile_args: true, includes: true) rt = cc.find_library('rt', required: false) -libdl = not_found -if 'CONFIG_PLUGIN' in config_host - libdl = cc.find_library('dl', required: false) - if not cc.has_function('dlopen', dependencies: libdl) - error('dlopen not found') - endif -endif + libiscsi = not_found if not get_option('libiscsi').auto() or have_block libiscsi = dependency('libiscsi', version: '>=1.9.0', diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 137a1a44cc..7a0a79d731 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -10,7 +10,7 @@ tcg_ss.add(files( )) tcg_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c')) tcg_ss.add(when: 'CONFIG_SOFTMMU', if_false: files('user-exec-stub.c')) -tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: [files('plugin-gen.c'), libdl]) +tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: [files('plugin-gen.c')]) specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss) specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files(