From d08e1e68758d5041afa79abd6a2d7dd1c45879d8 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Sun, 17 Jul 2022 16:41:40 +0530 Subject: [PATCH] Fix bug in 5200976949b93bc937a95d4453985e5e1a1160e2 --- pyinst.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pyinst.py b/pyinst.py index 55df1a78f..526e8802f 100644 --- a/pyinst.py +++ b/pyinst.py @@ -6,11 +6,10 @@ from PyInstaller.__main__ import run as run_pyinstaller -OS_NAME, MACHINE = sys.platform, platform.machine() -if MACHINE in ('x86_64', 'amd64'): - MACHINE = '' -elif 'i' in MACHINE and '86' in MACHINE: - MACHINE = 'x86' +OS_NAME, MACHINE, ARCH = sys.platform, platform.machine(), platform.architecture()[0][:2] +if MACHINE in ('x86_64', 'AMD64') or ('i' in MACHINE and '86' in MACHINE): + # NB: Windows x86 has MACHINE = AMD64 irrespective of bitness + MACHINE = 'x86' if ARCH == '32' else '' def main(): @@ -51,7 +50,6 @@ def parse_options(): # Compatibility with older arguments opts = sys.argv[1:] if opts[0:1] in (['32'], ['64']): - ARCH = platform.architecture()[0][:2] if ARCH != opts[0]: raise Exception(f'{opts[0]}bit executable cannot be built on a {ARCH}bit system') opts = opts[1:]