From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Fri, 11 Sep 2020 12:42:47 +0000 (+0200)
Subject: meson: fix MSI rule
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=18240fdcaa890cf1873fc2cd961411ab22183968;p=qemu.git

meson: fix MSI rule

The environment variables can't be passed through an env: argument
yet (meson#2723), use 'env' as suggested in:
https://github.com/mesonbuild/meson/issues/2723#issuecomment-348630957

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/qga/meson.build b/qga/meson.build
index 1c312b50cc..cd08bd953a 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -69,6 +69,7 @@ if targetos == 'windows'
                             output: 'qemu-ga-@0@.msi'.format(config_host['ARCH']),
                             depends: deps,
                             command: [
+                              find_program('env'),
                               'QEMU_GA_VERSION=' + config_host['QEMU_GA_VERSION'],
                               'QEMU_GA_MANUFACTURER=' + config_host['QEMU_GA_MANUFACTURER'],
                               'QEMU_GA_DISTRO=' + config_host['QEMU_GA_DISTRO'],