diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-05 11:04:13 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-05 14:20:34 +0100 |
| commit | 74c008c57fb48291c6701b9b1ab24eb3fc90840f (patch) | |
| tree | 89bfdb08562526a2b88874bf0e662b119a9948ad /cscript | |
| parent | 8f4b45d7e3c83d390fb77728f84d6984d0650a05 (diff) | |
Make a universal binary containing x86_64 for SDK 10.9 and arm64 for SDK 11.0.v2.15.116
Diffstat (limited to 'cscript')
| -rw-r--r-- | cscript | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -689,15 +689,7 @@ def package(target, version, options): elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia': return package_rpm(target, cpu, version, options) elif target.platform == 'osx': - name = '' - if hasattr(target, 'archs') and sorted(target.archs) == sorted(('arm64', 'x86_64')): - name = 'arm-intel' - elif hasattr(target, 'arch'): - if target.arch == 'x86_64': - name = 'intel' - elif target.arch == 'arm64': - name = 'arm' - target.command('bash platform/osx/make_dmg.sh %s %s %s %s %s %s' % (target.environment_prefix, target.directory, name, target.sdk, target.apple_id, target.apple_password)) + target.command('bash platform/osx/make_dmg.sh %s %s %s %s %s %s' % (target.environment_prefix, target.directory, target.intel_sdk, target.arm_sdk, target.apple_id, target.apple_password)) packages = [] for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg'): a = os.path.abspath(x) |
