From 739601760cef9ef945582801c5502b69c3d49e1a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 19 May 2021 00:30:25 +0200 Subject: [PATCH] fixup! Add osx-old target to target 10.8. --- cdist | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/cdist b/cdist index 4a5baf9..78fff30 100755 --- a/cdist +++ b/cdist @@ -806,8 +806,8 @@ class OSXTarget(Target): if notarize: notarize_dmg(x[0], x[1]) else: - with open(dmg + '.id', 'w') as f: - print(x[1], out=f) + with open(x[0] + '.id', 'w') as f: + print(x[1], file=f) return [x[0] for x in p] @@ -820,8 +820,11 @@ class OSXSingleTarget(OSXTarget): 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') - target_enviro = '%s/%s' % (config.get('osx_environment_prefix'), arch) + if arch == 'x86_64': + host_enviro = '%s/x86_64/%s' % (config.get('osx_environment_prefix'), deployment) + else: + host_enviro = '%s/x86_64/10.10' % config.get('osx_environment_prefix') + target_enviro = '%s/%s/%s' % (config.get('osx_environment_prefix'), arch, deployment) self.bin = '%s/bin' % target_enviro @@ -829,7 +832,7 @@ class OSXSingleTarget(OSXTarget): self.set('CFLAGS', '"-I%s/include -I%s/include %s"' % (self.directory, target_enviro, flags)) self.set('CPPFLAGS', '') self.set('CXXFLAGS', '"-I%s/include -I%s/include -stdlib=libc++ %s"' % (self.directory, target_enviro, flags)) - self.set('LDFLAGS', '"-L%s/lib -L%s/lib %s"' % (self.directory, target_enviro, flags)) + self.set('LDFLAGS', '"-L%s/lib -L%s/lib -stdlib=libc++ %s"' % (self.directory, target_enviro, flags)) self.set('LINKFLAGS', '"-L%s/lib -L%s/lib %s"' % (self.directory, target_enviro, flags)) self.set('PKG_CONFIG_PATH', '%s/lib/pkgconfig:%s/lib/pkgconfig:/usr/lib/pkgconfig' % (self.directory, target_enviro)) self.set('PATH', '$PATH:/usr/bin:/sbin:/usr/local/bin:%s/bin' % host_enviro) @@ -857,7 +860,7 @@ class OSXUniversalTarget(OSXTarget): self.sdk = config.get('osx_sdk') 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 = OSXSingleTarget(arch, self.sdk, deployment, os.path.join(self.directory, arch, deployment)) target.ccache = self.ccache self.sub_targets.append(target) -- 2.30.2