From nobody Fri Nov 7 20:02:04 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548762226263620.4370311168846; Tue, 29 Jan 2019 03:43:46 -0800 (PST) Received: from localhost ([127.0.0.1]:47817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goRno-0004er-9n for importer@patchew.org; Tue, 29 Jan 2019 06:43:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goRk5-0001z4-2f for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goRk4-0001ip-9Q for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53420) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1goRk2-0001bf-8I for qemu-devel@nongnu.org; Tue, 29 Jan 2019 06:39:48 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 00B03C08733F; Tue, 29 Jan 2019 11:39:36 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-66.ams2.redhat.com [10.36.112.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id F24595D717; Tue, 29 Jan 2019 11:39:31 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 29 Jan 2019 11:39:19 +0000 Message-Id: <20190129113921.21599-4-berrange@redhat.com> In-Reply-To: <20190129113921.21599-1-berrange@redhat.com> References: <20190129113921.21599-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 29 Jan 2019 11:39:36 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/5] nsis: ensure we always pass -W64 flag to nsis installer script X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Baxter , Stefan Weil , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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=C3=A9 --- 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 =3D qemu-setup-$(VERSION)$(EXESUF) =20 nsisflags =3D -V2 -NOCD =20 +ifeq ($(ARCH),x86_64) +nsisflags +=3D -DW64 +endif + ifneq ($(wildcard $(SRC_PATH)/dll),) ifeq ($(ARCH),x86_64) # 64 bit executables DLL_PATH =3D $(SRC_PATH)/dll/w64 -nsisflags +=3D -DW64 else # 32 bit executables DLL_PATH =3D $(SRC_PATH)/dll/w32 --=20 2.20.1