diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2014-06-04 18:38:59 -0700 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2014-06-04 18:38:59 -0700 |
| commit | f6df8bd54a4280356c158b1b2f0e6c722395d308 (patch) | |
| tree | e6df236e475c02da286d51218a2d16f51fc337af /scripts | |
| parent | e1a8d7ddc7adb73e681ded8c4e385b304ee9b434 (diff) | |
| download | qtlocation-mapboxgl-f6df8bd54a4280356c158b1b2f0e6c722395d308.tar.gz | |
[travis] fix linux setup
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/setup_travis.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/setup_travis.sh b/scripts/setup_travis.sh index 7fcaf66e28..294710d5d7 100755 --- a/scripts/setup_travis.sh +++ b/scripts/setup_travis.sh @@ -7,7 +7,7 @@ set -o pipefail if [[ "${TRAVIS_OS_NAME:-false}" == false ]]; then if [[ $(uname -s) == "Darwin" ]]; then TRAVIS_OS_NAME="osx" - elif [[ $(uname -s) == "Darwin" ]]; then + elif [[ $(uname -s) == "Linux" ]]; then TRAVIS_OS_NAME="linux" fi fi @@ -27,7 +27,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export CXX="g++-4.8" ; fi - # Tf building in debug then turn on sanitizers. + # If building in debug then turn on sanitizers. # They should both work with latest g++/clang++ # but it's not worth a standalone matrix so here # we just test address->gcc and thread->clang for |