diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-12-26 01:45:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-12-27 23:28:11 +0100 |
| commit | 6d911b7fd0815e329393ee0049a3c83491086cc1 (patch) | |
| tree | 406c7f2ee2e3f36d7e36d52d87056de61141bb51 | |
| parent | f71525e9e2a20d4955e26ebd51eb734b9b046317 (diff) | |
Try to support universal or arm-only builds.
| -rwxr-xr-x | cdist | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -909,15 +909,17 @@ def target_factory(args): target = LinuxTarget(p[0], None, int(p[1]), args.work) elif s == 'raspbian': target = LinuxTarget(s, None, None, args.work) - elif s == 'osx-intel': - # Universal Intel 32/64-bit + elif s == 'osx-intel-32-64': + # Universal Intel 32/64-bit built for config's os_sdk if args.command == 'build': target = OSXSingleTarget('x86_64', args.work) else: target = OSXUniversalTarget(('i386', 'x86_64'), args.work) - elif s == 'osx-arm': - # Universal arm64 and Intel 64-bit + elif s == 'osx-arm-intel-64': + # Universal arm64 and Intel 64-bit built for SDK 11.0 target = OSXUniversalTarget(('arm64', 'x86_64'), args.work) + elif s == 'osx-arm64': + target = OSXSingleTarget('arm64', '11.0', args.work) elif s == 'source': target = SourceTarget() elif s == 'flatpak': |
