From: Carl Hetherington <cth@carlh.net>
Date: Sat, 2 Jan 2021 19:00:10 +0000 (+0100)
Subject: More 32-bit removal.
X-Git-Url: https://main.carlh.net/gitweb/?p=cdist.git;a=commitdiff_plain;h=1f3f05c6df033eaa155952a2da9ad107888a25f1

More 32-bit removal.
---

diff --git a/cdist b/cdist
index 0024b65..7480499 100755
--- a/cdist
+++ b/cdist
@@ -914,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':