From nobody Sat May 4 05:04:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1606332171; cv=none; d=zohomail.com; s=zohoarc; b=kukRx7kES67TDSMBSCWcJodtaa1J/sCztqdvydPuCls6mimdCUqxqpYM4yiqipHQKDm2HXYrxzHsgoyNt5Lyy54Y7d+sQEcAbNOpqwMbsnItzCvqaAllZKEmcCcAPasBT3ctlgRoFyRUX7TovzuMJ/8KUcJizx/rGui5n70knXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606332171; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=3LGJJGF/RhydXBNPbdxb0IUuq6kOufILdahaRj8Ksks=; b=G+6d5biN+GyujdB5WGiVlasiGzQls+I4aQqxRHXyCox0V/KJuFhMu6r+TLZ/GFSzM++T+HghLH3PEoTD/KXDucBIL3PzZdrhQMoj7HseoJ7QpZO9Tc7DI4UOSOwMOY9MStmBFhkptwWXDP+RxrEWoSHK/OmLnKB9LQULg0O9cag= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606332171625509.95603733266626; Wed, 25 Nov 2020 11:22:51 -0800 (PST) Received: from localhost ([::1]:40772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ki0NO-0007MZ-55 for importer@patchew.org; Wed, 25 Nov 2020 14:22:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ki0MW-0006uK-MC for qemu-devel@nongnu.org; Wed, 25 Nov 2020 14:21:56 -0500 Received: from mail.weilnetz.de ([37.120.169.71]:57624 helo=v2201612906741603.powersrv.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ki0MS-00020v-VB for qemu-devel@nongnu.org; Wed, 25 Nov 2020 14:21:55 -0500 Received: from localhost (localhost [127.0.0.1]) by v2201612906741603.powersrv.de (Postfix) with ESMTP id 7B203DB2527; Wed, 25 Nov 2020 20:21:48 +0100 (CET) Received: from v2201612906741603.powersrv.de ([127.0.0.1]) by localhost (v2201612906741603.powersrv.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9UQwxnoFKehq; Wed, 25 Nov 2020 20:18:36 +0100 (CET) Received: from qemu.weilnetz.de (qemu.weilnetz.de [188.68.58.204]) by v2201612906741603.powersrv.de (Postfix) with ESMTP id DF027DA32DA; Wed, 25 Nov 2020 20:18:35 +0100 (CET) Received: by qemu.weilnetz.de (Postfix, from userid 1000) id 7494546000F; Wed, 25 Nov 2020 20:18:35 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at v2201612906741603.powersrv.de From: Stefan Weil To: qemu-devel@nongnu.org, Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH for-5.2] nsis: Fix build for 64 bit installer Date: Wed, 25 Nov 2020 20:18:33 +0100 Message-Id: <20201125191833.964753-1-sw@weilnetz.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=37.120.169.71; envelope-from=stefan@weilnetz.de; helo=v2201612906741603.powersrv.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Weil Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Pass cpu instead of cpu_family to the NSIS installer script. That script checks for "x86_64" which is the cpu value, while cpu_family is "x86". Signed-off-by: Stefan Weil Reviewed-by: Marc-Andr=C3=A9 Lureau --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 5062407c70..8a99c948d3 100644 --- a/meson.build +++ b/meson.build @@ -1956,7 +1956,7 @@ if host_machine.system() =3D=3D 'windows' '@OUTPUT@', get_option('prefix'), meson.current_source_dir(), - host_machine.cpu_family(), + host_machine.cpu(), '--', '-DDISPLAYVERSION=3D' + meson.project_version(), ] --=20 2.29.2