From: Stefan Weil <sw@weilnetz.de>
Date: Wed, 25 Nov 2020 19:18:33 +0000 (+0100)
Subject: nsis: Fix build for 64 bit installer
X-Git-Tag: v5.2.0-rc4~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24bdcc9608fad3dce2bcf3362722493f1ba0f3eb;p=thirdparty%2Fqemu.git

nsis: Fix build for 64 bit installer

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 <sw@weilnetz.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20201125191833.964753-1-sw@weilnetz.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/meson.build b/meson.build
index 360623ece95..e3386196ba4 100644
--- a/meson.build
+++ b/meson.build
@@ -1955,7 +1955,7 @@ if host_machine.system() == 'windows'
     '@OUTPUT@',
     get_option('prefix'),
     meson.current_source_dir(),
-    host_machine.cpu_family(),
+    host_machine.cpu(),
     '--',
     '-DDISPLAYVERSION=' + meson.project_version(),
   ]