summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-05-18 07:41:02 +0200
committerCarl Hetherington <cth@carlh.net>2021-05-18 07:41:02 +0200
commitcd9dae6cca2800a64ab5c037f7c33572c6629977 (patch)
treef49dcf6c2d5694c366599f822ca0a1dd2f9eef72
parent93c80f4139a6d99d6a12d11d5a1617ddb6093ee8 (diff)
fixup! Add osx-old target to target 10.8.
-rwxr-xr-xcdist8
1 files changed, 6 insertions, 2 deletions
diff --git a/cdist b/cdist
index 6551b30..4a5baf9 100755
--- a/cdist
+++ b/cdist
@@ -817,6 +817,7 @@ class OSXSingleTarget(OSXTarget):
self.arch = arch
self.sdk = sdk
self.deployment = deployment
+ self.sub_targets = [self]
flags = '-isysroot %s/MacOSX%s.sdk -arch %s' % (self.sdk_prefix, sdk, arch)
host_enviro = '%s/x86_64' % config.get('osx_environment_prefix')
@@ -854,11 +855,14 @@ class OSXUniversalTarget(OSXTarget):
def __init__(self, directory=None):
super(OSXUniversalTarget, self).__init__(directory)
self.sdk = config.get('osx_sdk')
-
- def package(self, project, checkout, output_dir, options, notarize):
+ self.sub_targets = []
for arch, deployment in (('x86_64', config.get('osx_intel_deployment')), ('arm64', config.get('osx_arm_deployment'))):
target = OSXSingleTarget(arch, self.sdk, deployment, os.path.join(self.directory, arch))
target.ccache = self.ccache
+ self.sub_targets.append(target)
+
+ def package(self, project, checkout, output_dir, options, notarize):
+ for target in self.sub_targets:
tree = globals.trees.get(project, checkout, target)
tree.build_dependencies(options)
tree.build(options)