[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/7] meson: Fix argument for makensis (build regression)
From: |
Paolo Bonzini |
Subject: |
[PULL 1/7] meson: Fix argument for makensis (build regression) |
Date: |
Wed, 18 Nov 2020 11:19:34 +0100 |
From: Stefan Weil <sw@weilnetz.de>
`make installer` with a DLL directory was broken.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-Id: <20201117190640.390359-1-sw@weilnetz.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
scripts/nsis.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/nsis.py b/scripts/nsis.py
index e1c409344e..5135a05831 100644
--- a/scripts/nsis.py
+++ b/scripts/nsis.py
@@ -65,7 +65,7 @@ def main():
dlldir = "w64"
makensis += ["-DW64"]
if os.path.exists(os.path.join(args.srcdir, "dll")):
- makensis += "-DDLLDIR={0}/dll/{1}".format(args.srcdir, dlldir)
+ makensis += ["-DDLLDIR={0}/dll/{1}".format(args.srcdir, dlldir)]
makensis += ["-DOUTFILE=" + args.outfile] + args.nsisargs
subprocess.run(makensis)
--
2.28.0
- [PULL 0/7] HVF and Windows changes for QEMU 5.2-rc, Paolo Bonzini, 2020/11/18
- [PULL 1/7] meson: Fix argument for makensis (build regression),
Paolo Bonzini <=
- [PULL 2/7] docs: Fix some typos (found by codespell), Paolo Bonzini, 2020/11/18
- [PULL 4/7] meson: Fixes curses detection on msys2, Paolo Bonzini, 2020/11/18
- [PULL 3/7] meson: Fix build with --disable-guest-agent-msi, Paolo Bonzini, 2020/11/18
- [PULL 5/7] hvf: Gate RDTSCP on CPU_BASED2_RDTSCP, not just CPU_BASED_TSC_OFFSET, Paolo Bonzini, 2020/11/18
- [PULL 6/7] hvf: Fix segment selector format, Paolo Bonzini, 2020/11/18
- [PULL 7/7] buildsys: Help git-diff adding .gitattributes config file, Paolo Bonzini, 2020/11/18
- Re: [PULL 0/7] HVF and Windows changes for QEMU 5.2-rc, Peter Maydell, 2020/11/18