[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/5] nsis: Fix build for 64 bit installer
From: |
Paolo Bonzini |
Subject: |
[PULL 5/5] nsis: Fix build for 64 bit installer |
Date: |
Thu, 26 Nov 2020 02:59:21 -0500 |
From: Stefan Weil <sw@weilnetz.de>
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>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 360623ece9..e3386196ba 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(),
]
--
2.26.2
- [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2, Paolo Bonzini, 2020/11/26
- [PULL 2/5] configure: remove python pkg_resources check, Paolo Bonzini, 2020/11/26
- [PULL 3/5] tests/docker, tests/vm: remove setuptools from images, Paolo Bonzini, 2020/11/26
- [PULL 1/5] meson: use dependency() to find libjpeg, Paolo Bonzini, 2020/11/26
- [PULL 4/5] target/i386: fix operand order for PDEP and PEXT, Paolo Bonzini, 2020/11/26
- [PULL 5/5] nsis: Fix build for 64 bit installer,
Paolo Bonzini <=
- Re: [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2, no-reply, 2020/11/26
- Re: [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2, Peter Maydell, 2020/11/26
- Re: [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2, Peter Maydell, 2020/11/26