Try to build universal binaries on OS X.

1 files changed, 5 insertions, 5 deletions

diff --git a/cdist b/cdist
index 3b522b8..4bb2597 100755
--- a/cdist
+++ b/cdist
@@ -259,14 +259,14 @@ class RemoteEnvironment(Environment):
         for g in glob.glob('%s/*' % self.host_mount_dir):
             rmtree(g)
 
-        sysroot = '-isysroot %s/MacOSX%s.sdk' % (OSX_SDK_PREFIX, self.osx_sdk)
+        flags = '-isysroot %s/MacOSX%s.sdk -arch i386 -arch x86_64' % (OSX_SDK_PREFIX, self.osx_sdk)
         enviro = '%s/%s' % (OSX_ENVIRONMENT_PREFIX, self.osx_sdk)
 
         # Environment variables
-        self.set('CCFLAGS', '"-I%s/include -I%s/include %s"' % (self.dir_on_host, enviro, sysroot))
-        self.set('CXXFLAGS', '"-I%s/include -I%s/include %s"' % (self.dir_on_host, enviro, sysroot))
-        self.set('LDFLAGS', '"-L%s/lib -L%s/lib %s"' % (self.dir_on_host, enviro, sysroot))
-        self.set('LINKFLAGS', '"-L%s/lib -L%s/lib %s"' % (self.dir_on_host, enviro, sysroot))
+        self.set('CCFLAGS', '"-I%s/include -I%s/include %s"' % (self.dir_on_host, enviro, flags))
+        self.set('CXXFLAGS', '"-I%s/include -I%s/include %s"' % (self.dir_on_host, enviro, flags))
+        self.set('LDFLAGS', '"-L%s/lib -L%s/lib %s"' % (self.dir_on_host, enviro, flags))
+        self.set('LINKFLAGS', '"-L%s/lib -L%s/lib %s"' % (self.dir_on_host, enviro, flags))
         self.set('PKG_CONFIG_PATH', '%s/lib/pkgconfig:%s/lib/pkgconfig' % (self.dir_on_host, enviro))
         self.set('PATH', '$PATH:/usr/bin:/sbin:/usr/local/bin:%s/bin' % enviro)
         self.set('MACOSX_DEPLOYMENT_TARGET', self.osx_sdk)