diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-01 06:44:23 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-08 11:43:16 +0200 |
| commit | ccf7afa59e070b0cc65618af91dc01105f04e566 (patch) | |
| tree | 60c33c4bb5960da48ebe716ab24b9d7279ad5e97 | |
| parent | 201e8ed7df00cffe6df967bd42903c1cbcecd721 (diff) | |
| download | qemu-ccf7afa59e070b0cc65618af91dc01105f04e566.zip qemu-ccf7afa59e070b0cc65618af91dc01105f04e566.tar.gz qemu-ccf7afa59e070b0cc65618af91dc01105f04e566.tar.bz2 | |
configure: move -ldl test to meson
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | accel/tcg/meson.build | 2 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | meson.build | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 2a335b5..96a76ed 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -9,7 +9,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')) +tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: [files('plugin-gen.c'), libdl]) specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss) specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files('tcg-all.c', 'cputlb.c')) @@ -7463,7 +7463,6 @@ fi if test "$plugins" = "yes" ; then echo "CONFIG_PLUGIN=y" >> $config_host_mak - LIBS="-ldl $LIBS" # Copy the export object list to the build dir if test "$ld_dynamic_list" = "yes" ; then echo "CONFIG_HAS_LD_DYNAMIC_LIST=yes" >> $config_host_mak diff --git a/meson.build b/meson.build index d619cd9..8cc26fd 100644 --- a/meson.build +++ b/meson.build @@ -211,6 +211,10 @@ libmpathpersist = not_found if config_host.has_key('CONFIG_MPATH') libmpathpersist = cc.find_library('mpathpersist') endif +libdl = not_found +if 'CONFIG_PLUGIN' in config_host + libdl = cc.find_library('dl', required: true) +endif libiscsi = not_found if 'CONFIG_LIBISCSI' in config_host libiscsi = declare_dependency(compile_args: config_host['LIBISCSI_CFLAGS'].split(), |