diff --git a/build.py b/build.py index cd16a8c1..b0c8f122 100755 --- a/build.py +++ b/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: diff --git a/buildbot/master.cfg b/buildbot/master.cfg index 89f4883c..66c12447 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -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']: