diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-09-13 19:41:18 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-09-13 19:41:18 +0400 |
| commit | 13263541ec2ccc6aa86e255a235e28099af5c127 (patch) | |
| tree | 0c525eeafcd75964ee9a479ad426452461b7508b /build_files | |
| parent | 3596ab932c9b3da89760e3d32e48c174b8ca5fea (diff) | |
OSX/scons: take xcode-select path into account, to work well with different xcode versions
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 81f3a81bce5..a87070500dd 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -42,6 +42,12 @@ XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version cmd = 'xcodebuild -showsdks' cmd_sdk=commands.getoutput(cmd) MACOSX_SDK_CHECK=cmd_sdk +cmd = 'xcode-select --print-path' +XCODE_SELECT_PATH=commands.getoutput(cmd) +if XCODE_SELECT_PATH.endswith("/Contents/Developer"): + XCODE_BUNDLE=XCODE_SELECT_PATH[:-19] +else: + XCODE_BUNDLE=XCODE_SELECT_PATH if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64': USE_QTKIT=True # Carbon quicktime is not available for 64bit @@ -99,7 +105,7 @@ else : LIBDIR = '${LCGDIR}' if XCODE_CUR_VER >= '4.3': ## since version 4.3, XCode and developer dir are bundled ## - MACOSX_SDK = '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform' + MACOSX_SDK + MACOSX_SDK = XCODE_BUNDLE + '/Contents/Developer/Platforms/MacOSX.platform' + MACOSX_SDK ############################################################################# ################### Dependency settings ################## |