diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | build_files/buildbot/config/user-config-mac-i386.py | 4 | ||||
| -rw-r--r-- | build_files/buildbot/config/user-config-mac-x86_64.py | 4 | ||||
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 040e393867b..e0d7b81cc0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -306,7 +306,9 @@ if(APPLE) endif() execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version - if(${MAC_SYS} MATCHES 12) + if(${MAC_SYS} MATCHES 13) + set(OSX_SYSTEM 10.9) + elseif(${MAC_SYS} MATCHES 12) set(OSX_SYSTEM 10.8) elseif(${MAC_SYS} MATCHES 11) set(OSX_SYSTEM 10.7) diff --git a/build_files/buildbot/config/user-config-mac-i386.py b/build_files/buildbot/config/user-config-mac-i386.py index 60f8b5705ac..ad0fbcc78da 100644 --- a/build_files/buildbot/config/user-config-mac-i386.py +++ b/build_files/buildbot/config/user-config-mac-i386.py @@ -34,6 +34,8 @@ elif cmd_res[:2]=='11': MAC_CUR_VER='10.7' elif cmd_res[:2]=='12': MAC_CUR_VER='10.8' +elif cmd_res[:2]=='13': + MAC_CUR_VER='10.9' cmd = 'xcodebuild -version' cmd_xcode=commands.getoutput(cmd) XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version @@ -367,7 +369,7 @@ if not WITH_OSX_STATICPYTHON: #note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4 #for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore) -if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"): +if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk") or MACOSX_SDK.endswith("10.9.sdk"): LLIBS = ['stdc++'] else: LLIBS = ['stdc++', 'SystemStubs'] diff --git a/build_files/buildbot/config/user-config-mac-x86_64.py b/build_files/buildbot/config/user-config-mac-x86_64.py index 4fab8d6d566..fb0a084cf4d 100644 --- a/build_files/buildbot/config/user-config-mac-x86_64.py +++ b/build_files/buildbot/config/user-config-mac-x86_64.py @@ -34,6 +34,8 @@ elif cmd_res[:2]=='11': MAC_CUR_VER='10.7' elif cmd_res[:2]=='12': MAC_CUR_VER='10.8' +elif cmd_res[:2]=='13': + MAC_CUR_VER='10.9' cmd = 'xcodebuild -version' cmd_xcode=commands.getoutput(cmd) XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version @@ -367,7 +369,7 @@ if not WITH_OSX_STATICPYTHON: #note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4 #for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore) -if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"): +if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk") or MACOSX_SDK.endswith("10.9.sdk"): LLIBS = ['stdc++'] else: LLIBS = ['stdc++', 'SystemStubs'] diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index f7192e3dd81..57ff3c827f7 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -34,6 +34,8 @@ elif cmd_res[:2]=='11': MAC_CUR_VER='10.7' elif cmd_res[:2]=='12': MAC_CUR_VER='10.8' +elif cmd_res[:2]=='13': + MAC_CUR_VER='10.9' cmd = 'xcodebuild -version' cmd_xcode=commands.getoutput(cmd) XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version @@ -367,7 +369,7 @@ if not WITH_OSX_STATICPYTHON: #note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4 #for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore) -if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"): +if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk") or MACOSX_SDK.endswith("10.9.sdk"): LLIBS = ['stdc++'] else: LLIBS = ['stdc++', 'SystemStubs'] |