More 32-bit removal.

[cdist.git] / cdist

diff --git a/cdist b/cdist
index 09b35fc761f3f1e9496861811c7cb445c397e94d..7480499c4e8fa9aed3af6dd24780aa11732278c9 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -802,8 +802,8 @@ class OSXSingleTarget(OSXTarget):
         self.sdk = sdk
 
         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)
+        host_enviro = '%s/x86_64/10.9' % config.get('osx_environment_prefix')
+        target_enviro = '%s/%s/%s' % (config.get('osx_environment_prefix'), arch, sdk)
 
         self.bin = '%s/bin' % target_enviro
 
@@ -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)
@@ -916,13 +914,10 @@ 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-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-intel-64':
+    elif s == 'osx-intel':
+        # Intel 64-bit built for config's os_sdk
+        target = OSXSingleTarget('x86_64', config.get('osx_sdk'), args.work)
+    elif s == 'osx-arm-intel':
         # Universal arm64 and Intel 64-bit built for SDK 11.0
         target = OSXUniversalTarget(('arm64', 'x86_64'), args.work)
     elif s == 'osx-arm64':