diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-15 18:44:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-15 18:44:46 +0100 |
| commit | 3b56921776bfdba7b7f0ea9605865c67b9451a71 (patch) | |
| tree | b8245351bb0d099f05ebbe0eafb1c8fdfc6181a3 | |
| parent | 0e9fe03d45b826d9ad2312548f3dc9ff4bef67a7 (diff) | |
Try adding sysroot stuff to some more environment variables.
| -rwxr-xr-x | cdist | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -31,7 +31,7 @@ GIT_DIR = 'ssh://houllier/home/carl/git' OSX_BUILD_HOST = 'carl@192.168.1.202' DIR_ON_HOST = '/Users/carl/cdist' OSX_ENVIRONMENT_PREFIX = '/Users/carl/Environments/osx' - +OSX_SDK_PREFIX = '/Users/carl/SDK' import os import sys @@ -259,11 +259,13 @@ class RemoteEnvironment(Environment): for g in glob.glob('%s/*' % self.host_mount_dir): rmtree(g) - sysroot = '-isysroot %s' % (OSX_SDK_PREFIX, self.osx_sdk) + sysroot = '-isysroot %s/MacOSX%s.sdk' % (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('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) |
