This commit is contained in:
pukkandan 2022-07-17 16:41:40 +05:30
parent 956f1cf805
commit d08e1e6875
No known key found for this signature in database
GPG Key ID: 7EEE9E1E817D0A39

View File

@ -6,11 +6,10 @@ import sys
from PyInstaller.__main__ import run as run_pyinstaller from PyInstaller.__main__ import run as run_pyinstaller
OS_NAME, MACHINE = sys.platform, platform.machine() OS_NAME, MACHINE, ARCH = sys.platform, platform.machine(), platform.architecture()[0][:2]
if MACHINE in ('x86_64', 'amd64'): if MACHINE in ('x86_64', 'AMD64') or ('i' in MACHINE and '86' in MACHINE):
MACHINE = '' # NB: Windows x86 has MACHINE = AMD64 irrespective of bitness
elif 'i' in MACHINE and '86' in MACHINE: MACHINE = 'x86' if ARCH == '32' else ''
MACHINE = 'x86'
def main(): def main():
@ -51,7 +50,6 @@ def parse_options():
# Compatibility with older arguments # Compatibility with older arguments
opts = sys.argv[1:] opts = sys.argv[1:]
if opts[0:1] in (['32'], ['64']): if opts[0:1] in (['32'], ['64']):
ARCH = platform.architecture()[0][:2]
if ARCH != opts[0]: if ARCH != opts[0]:
raise Exception(f'{opts[0]}bit executable cannot be built on a {ARCH}bit system') raise Exception(f'{opts[0]}bit executable cannot be built on a {ARCH}bit system')
opts = opts[1:] opts = opts[1:]