--- build.py.orig +++ build.py @@ -1504,11 +1504,6 @@ if options.osx_cocoa: build_options.append("--osx_cocoa") - if options.mac_arch: - build_options.append("--mac_universal_binary=%s" % options.mac_arch) - else: - build_options.append("--mac_universal_binary=default") - if options.no_config: build_options.append('--no_config') elif not options.force_config: @@ -1589,9 +1584,6 @@ def copyWxDlls(options): - if options.no_magic or options.use_syswx: - return - if isWindows: # Copy the wxWidgets DLLs to the wxPython package folder msw = getMSWSettings(options) @@ -1634,8 +1626,6 @@ cfg = Config() wxlibdir = os.path.join(getBuildDir(options), "lib") dlls = glob.glob(wxlibdir + '/*.dylib') - for dll in dlls: - copyIfNewer(dll, posixjoin(phoenixDir(), cfg.PKGDIR, os.path.basename(dll)), verbose=True) # Now use install_name_tool to change the extension modules to look # in the same folder for the wx libs, instead of the build dir. Also