mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2026-01-10 05:47:09 +01:00
Explicitly build for both architectures on Mac instead of expecting it to be done by default.
This commit is contained in:
11
build.py
11
build.py
@@ -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:
|
||||
|
||||
@@ -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']:
|
||||
|
||||
Reference in New Issue
Block a user