diff options
author | RJ Ryan <rryan@mixxx.org> | 2016-12-04 10:11:06 -0800 |
---|---|---|
committer | RJ Ryan <rryan@mixxx.org> | 2016-12-04 16:08:49 -0800 |
commit | d0ae873375243a609f669a293c744f9674df6fa7 (patch) | |
tree | 8e8d727b009cd7182c8bea7dc04ac966a71f54dd /build/mixxx.py | |
parent | 5627a1a031a0f320e04186532ae37916707248fc (diff) |
Simplify macOS minimum version enforcement.
* Remove osx_sdk_version_min scons flag. It didn't actually set the
minimum version is all the necessary places.
* Use build/osx/product_definition.plist as the source of truth for the
minimum verison.
Diffstat (limited to 'build/mixxx.py')
-rw-r--r-- | build/mixxx.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/build/mixxx.py b/build/mixxx.py index 1716aa0dc4..eb61791b91 100644 --- a/build/mixxx.py +++ b/build/mixxx.py @@ -325,14 +325,12 @@ class MixxxBuild(object): print 'Automatically detecting Mac OS X SDK.' - # Mixxx >2.0 requires C++11 which is only available with libc++ and - # OS X 10.7 onwards. + + # Returns a version like "10.8.0". We strip off the last ".0". + osx_min_version = util.get_osx_min_version() + assert osx_min_version.endswith('.0') + osx_min_version = osx_min_version[:len(osx_min_version) - 2] osx_stdlib = 'libc++' - sdk_version_default = '10.7' - # TODO(rryan): This flag is misnamed. It should be - # osx_version_min. We can use a newer SDK with a min OSX version of - # 10.7. - min_osx_version = Script.ARGUMENTS.get('osx_sdk_version_min', sdk_version_default) print "XCode developer directory:", os.popen('xcode-select -p').readline().strip() @@ -359,7 +357,7 @@ class MixxxBuild(object): print "Automatically selected OS X SDK:", sdk_path common_flags = ['-isysroot', sdk_path, - '-mmacosx-version-min=%s' % min_osx_version, + '-mmacosx-version-min=%s' % osx_min_version, '-stdlib=%s' % osx_stdlib] link_flags = [ '-Wl,-syslibroot,' + sdk_path, |