Add sdk to OSXUniversalTarget.
authorCarl Hetherington <cth@carlh.net>
Fri, 1 Jan 2021 13:54:18 +0000 (14:54 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 14 Jan 2021 02:31:03 +0000 (03:31 +0100)
cdist

diff --git a/cdist b/cdist
index 5e494b398f71727f81472eada889590dadfdc10a..0024b65def8499096ce3ffa36ef57a6123c69fcd 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -837,16 +837,14 @@ class OSXUniversalTarget(OSXTarget):
     def __init__(self, archs, directory=None):
         super(OSXUniversalTarget, self).__init__(directory)
         self.archs = archs
-
-    def package(self, project, checkout, output_dir, options, notarize):
-
-        sdk = config.get('osx_sdk')
+        self.sdk = config.get('osx_sdk')
         for a in self.archs:
             if a.find('arm') != -1:
-                sdk = '11.0'
+                self.sdk = '11.0'
 
+    def package(self, project, checkout, output_dir, options, notarize):
         for a in self.archs:
-            target = OSXSingleTarget(a, sdk, os.path.join(self.directory, a))
+            target = OSXSingleTarget(a, self.sdk, os.path.join(self.directory, a))
             target.ccache = self.ccache
             tree = globals.trees.get(project, checkout, target)
             tree.build_dependencies(options)