Adapt for changes to environment structure.
authorCarl Hetherington <cth@carlh.net>
Tue, 5 Jan 2021 23:43:51 +0000 (00:43 +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 bc11f4a0ae1c98d9150b168615ec7da5011a2a6b..c0ff509e6bb6abe521f8d1303d351bb7eb45c511 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -804,8 +804,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/10.9' % config.get('osx_environment_prefix')
-        target_enviro = '%s/%s/%s' % (config.get('osx_environment_prefix'), arch, sdk)
+        host_enviro = '%s/x86_64' % config.get('osx_environment_prefix')
+        target_enviro = '%s/%s' % (config.get('osx_environment_prefix'), arch)
 
         self.bin = '%s/bin' % target_enviro