Explicitly build for both architectures on Mac instead of expecting it to be done by default.

This commit is contained in:
Robin Dunn
2022-06-01 10:08:47 -07:00
parent f58bb9e355
commit c2dbb03e92
2 changed files with 3 additions and 10 deletions

View File

@@ -322,15 +322,6 @@ def setDevModeOptions(args):
# anybody besides Robin is using this option do not depend on the options
# it inserts into the args list being consistent. They could change at any
# update from the repository.
if isDarwin:
import platform
proc = platform.processor()
if proc == 'i386':
proc = 'x86_64'
if proc == 'arm':
proc = 'arm64'
else:
proc = 'unk'
myDevModeOptions = [
#'--build_dir=../bld',
@@ -340,7 +331,7 @@ def setDevModeOptions(args):
# These will be ignored on the other platforms so it is okay to
# include them unconditionally
'--osx_cocoa',
'--mac_arch={}'.format(proc),
'--mac_arch=arm64,x86_64',
'--no_allmo',
]
if not isWindows:

View File

@@ -130,6 +130,8 @@ def makeBuildFactory(wxport, py_ver, build_type='basic'):
common_opts.append('--cairo')
if wxport == 'win64':
common_opts.append('--x64')
if wxport == 'macosx':
common_opts.append('--mac_arch=arm64,x86_64')
if build_type == 'dist':
common_opts.append('--relwithdebug')
if build_type not in ['docs', 'sdist']: