From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Adam Baxter" <voltagex@voltagex.org>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Stefan Weil" <sw@weilnetz.de>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH 3/5] nsis: ensure we always pass -W64 flag to nsis installer script
Date: Tue, 29 Jan 2019 11:39:19 +0000 [thread overview]
Message-ID: <20190129113921.21599-4-berrange@redhat.com> (raw)
In-Reply-To: <20190129113921.21599-1-berrange@redhat.com>
The code to set the -W64 flag is inside a conditional block that only
executes when we are bundling DLLs with the installer. This results in
QEMU being installed in the wrong location on 64-bit hosts when DLLs
are not bundled.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 14a463564e..97a6727358 100644
--- a/Makefile
+++ b/Makefile
@@ -893,11 +893,14 @@ INSTALLER = qemu-setup-$(VERSION)$(EXESUF)
nsisflags = -V2 -NOCD
+ifeq ($(ARCH),x86_64)
+nsisflags += -DW64
+endif
+
ifneq ($(wildcard $(SRC_PATH)/dll),)
ifeq ($(ARCH),x86_64)
# 64 bit executables
DLL_PATH = $(SRC_PATH)/dll/w64
-nsisflags += -DW64
else
# 32 bit executables
DLL_PATH = $(SRC_PATH)/dll/w32
--
2.20.1
next prev parent reply other threads:[~2019-01-29 11:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-29 11:39 [Qemu-devel] [PATCH 0/5] misc fixes to deal with icon location changes Daniel P. Berrangé
2019-01-29 11:39 ` [Qemu-devel] [PATCH 1/5] nsis: don't install files into /tmp Daniel P. Berrangé
2019-01-29 21:07 ` Eric Blake
2019-02-01 7:28 ` Stefan Weil
2019-01-29 11:39 ` [Qemu-devel] [PATCH 2/5] make: don't insert a '/' after $(DESTDIR) Daniel P. Berrangé
2019-01-29 21:09 ` Eric Blake
2019-01-29 11:39 ` Daniel P. Berrangé [this message]
2019-02-01 7:18 ` [Qemu-devel] [PATCH 3/5] nsis: ensure we always pass -W64 flag to nsis installer script Stefan Weil
2019-01-29 11:39 ` [Qemu-devel] [PATCH 4/5] nsis: fix location of icons to be bundled in the installer Daniel P. Berrangé
2019-01-29 11:39 ` [Qemu-devel] [PATCH 5/5] configure: stop trying to link non-existant bmp file from bios dir Daniel P. Berrangé
2019-01-29 11:57 ` Peter Maydell
2019-02-01 7:52 ` [Qemu-devel] [PATCH 0/5] misc fixes to deal with icon location changes Stefan Weil
2019-02-01 9:23 ` Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190129113921.21599-4-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=sw@weilnetz.de \
--cc=voltagex@voltagex.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).