mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: Fix meson build with --enable-libdaxctl

Browse Source 
The daxctl library needs to be linked against when daxctl is asked for
in configure.

Signed-off-by: Bruce Rogers <brogers@suse.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Bruce Rogers 2020-08-24 09:52:12 -06:00 committed by Paolo Bonzini
parent 72bfe8ea63
commit c7c91a749b
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -7467,6 +7467,7 @@ fi
if test "$libdaxctl" = "yes" ; then if test "$libdaxctl" = "yes" ; then
echo "CONFIG_LIBDAXCTL=y" >> $config_host_mak echo "CONFIG_LIBDAXCTL=y" >> $config_host_mak
echo "LIBDAXCTL_LIBS=$libdaxctl_libs" >> $config_host_mak
fi fi
if test "$bochs" = "yes" ; then if test "$bochs" = "yes" ; then

6
meson.build
View File

@ -380,6 +380,10 @@ if 'CONFIG_LIBPMEM' in config_host
libpmem = declare_dependency(compile_args: config_host['LIBPMEM_CFLAGS'].split(), libpmem = declare_dependency(compile_args: config_host['LIBPMEM_CFLAGS'].split(),
link_args: config_host['LIBPMEM_LIBS'].split()) link_args: config_host['LIBPMEM_LIBS'].split())
endif endif
libdaxctl = not_found
if 'CONFIG_LIBDAXCTL' in config_host
libdaxctl = declare_dependency(link_args: config_host['LIBDAXCTL_LIBS'].split())
endif
# Create config-host.h # Create config-host.h
@ -787,7 +791,7 @@ common_ss.add(files('cpus-common.c'))
subdir('softmmu') subdir('softmmu')
specific_ss.add(files('disas.c', 'exec.c', 'gdbstub.c'), capstone, libpmem) specific_ss.add(files('disas.c', 'exec.c', 'gdbstub.c'), capstone, libpmem, libdaxctl)
specific_ss.add(files('exec-vary.c')) specific_ss.add(files('exec-vary.c'))
specific_ss.add(when: 'CONFIG_TCG', if_true: files( specific_ss.add(when: 'CONFIG_TCG', if_true: files(
'fpu/softfloat.c', 'fpu/softfloat.c',