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 /.travis.yml | |
| 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 '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 53bcb6bb94..57685b65f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,11 +70,10 @@ install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CXXFLAGS="-isystem /usr/local/include/opus" ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CFLAGS="-isystem /usr/local/include/opus" ; fi - # We support OS X 10.7 by default. # NOTE(rryan): 11/15/2016 we are experiencing Travis timeouts for the OSX # build. Turning off optimizations to see if that speeds up compile times. We # also need to avoid going over 4MB of output so we turn off verbose mode. - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS="osx_sdk_version_min=10.7 optimize=none verbose=0" ; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS="optimize=none verbose=0" ; fi #### # Common Build |