diff options
| author | RJ Ryan <rryan@mixxx.org> | 2017-01-03 01:29:24 -0800 |
|---|---|---|
| committer | RJ Ryan <rryan@mixxx.org> | 2017-01-03 01:29:24 -0800 |
| commit | 93bc889521aeb3e1f7dea896052673e76a8f91c2 (patch) | |
| tree | 30e629e72a17dfbdd071091719bc849ad6a38c8d /.travis.yml | |
| parent | df11425ae766e9bdfdfe84821b398aeeb17ac1ab (diff) | |
Disable localecompare on Travis mac build temporarily.
Also enable asan on Travis for macOS.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index cc8f0d81d3..5ae5269df3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ install: # Common # Build flags common to OS X and Linux. - - export COMMON="test=1 localecompare=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1" + - export COMMON="test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1" ##### # Ubuntu Trusty Build @@ -75,7 +75,9 @@ install: # 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. # NOTE(rryan): 12/31/2016 Homebrew has dropped qt4 support. Build with qt5. - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export EXTRA_FLAGS="optimize=none verbose=0 qt5=1" ; fi + # TODO(rryan): localecompare doesn't work on Travis with qt5 for some reason. + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export EXTRA_FLAGS="optimize=none asan=1 verbose=0 qt5=1 localecompare=0" ; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export EXTRA_FLAGS="localecompare=1" ; fi #### # Common Build |