On Tue, Aug 25, 2020 at 09:58:24PM +0400, marcandre.lur...@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lur...@redhat.com>
>
> When cross-compiling, by default qemu_datadir is 'c:\Program
> Files\QEMU', which is not recognized as being an absolute path, and
> meson will end up adding the prefix again.
>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> contrib/vhost-user-gpu/meson.build | 2 +-
> meson.build | 3 ++-
> pc-bios/descriptors/meson.build | 2 +-
> pc-bios/keymaps/meson.build | 6 +++---
> pc-bios/meson.build | 2 +-
> tools/virtiofsd/meson.build | 2 +-
> trace/meson.build | 2 +-
> 7 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index f0fe5f8799..20f20a7bfc 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -17,6 +17,7 @@ config_all_disas = keyval.load(meson.current_build_dir() /
> 'config-all-disas.mak
> enable_modules = 'CONFIG_MODULES' in config_host
> enable_static = 'CONFIG_STATIC' in config_host
> build_docs = 'BUILD_DOCS' in config_host
> +qemu_datadir = get_option('datadir') + get_option('confsuffix')
This needs to be
get_option('datadir') / get_option('confsuffix')
to add the dir separator if we're using the default meson value
for "confsuffix" which lacks a leading "/".
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
