diff options
author | RJ Ryan <rryan@mixxx.org> | 2016-05-03 14:34:02 -0700 |
---|---|---|
committer | RJ Ryan <rryan@mixxx.org> | 2016-05-03 14:34:02 -0700 |
commit | 5ad2e85138e1e72757afc6c34d6f8c679393553f (patch) | |
tree | 7329c9bddfc30cf98dac9a3a95357f446bb61d73 /build/mixxx.py | |
parent | 28546d13b4954d0e6359281e5a90886bcb02b77b (diff) |
Eliminate stdlib=libstdc++ on Mac since we require a standard library that supports c++11.
Diffstat (limited to 'build/mixxx.py')
-rw-r--r-- | build/mixxx.py | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/build/mixxx.py b/build/mixxx.py index 9b03c609f2..0196026df9 100644 --- a/build/mixxx.py +++ b/build/mixxx.py @@ -320,30 +320,20 @@ class MixxxBuild(object): print 'Automatically detecting Mac OS X SDK.' - # SDK versions in order of precedence. - sdk_versions = ( '10.11', '10.10', '10.9', '10.8', '10.7', '10.6', '10.5', ) - clang_sdk_versions = ( '10.11', '10.10', '10.9', '10.8', '10.7', ) - valid_cpp_lib_versions = ( 'libstdc++', 'libc++', ) - - # By default use old gcc C++ library version - osx_stdlib = Script.ARGUMENTS.get('stdlib', 'libstdc++') - if osx_stdlib not in valid_cpp_lib_versions: - raise Exception('Unsupported C++ stdlib version') - - if osx_stdlib == 'libc++': - sdk_version_default = '10.9' - else: - sdk_version_default = '10.5' + # SDK versions in order of precedence. Mixxx >2.0 requires C++11 + # which is only available with libc++ and OS X 10.7 onwards. + supported_sdk_versions = ( '10.11', '10.10', '10.9', '10.8', '10.7' ) + osx_stdlib = 'libc++' + # Default to the minimum supported version. + sdk_version_default = '10.7' min_sdk_version = Script.ARGUMENTS.get('osx_sdk_version_min', sdk_version_default) - if min_sdk_version not in sdk_versions: - raise Exception('Unsupported osx_sdk_version_min value') - if osx_stdlib == 'libc++' and min_sdk_version not in clang_sdk_versions: - raise Exception('stdlib=libc++ requires osx_sdk_version_min >= 10.7') + if min_sdk_version not in supported_sdk_versions: + raise Exception('Unsupported osx_sdk_version_min value') print "XCode developer directory:", os.popen('xcode-select -p').readline().strip() - for sdk in sdk_versions: + for sdk in supported_sdk_versions: sdk_path = os.popen( 'xcodebuild -version -sdk macosx%s Path' % sdk).readline().strip() if sdk_path: |