diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-11-07 10:54:38 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-11-08 18:02:38 +0200 |
| commit | 8e99ae44dd5bf72bc8bd844251e9d670095804ac (patch) | |
| tree | 38ddbf84fea7c9385de25f981d298fec9a99166a /scripts/travis_setup.sh | |
| parent | d0ac12309b470eb59690ece3f15773df73a127e1 (diff) | |
| download | qtlocation-mapboxgl-8e99ae44dd5bf72bc8bd844251e9d670095804ac.tar.gz | |
[build] Use mesa-13.0.0-glx in CI builds
Diffstat (limited to 'scripts/travis_setup.sh')
| -rwxr-xr-x | scripts/travis_setup.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/travis_setup.sh b/scripts/travis_setup.sh index 47df36788d..6c39b3f42c 100755 --- a/scripts/travis_setup.sh +++ b/scripts/travis_setup.sh @@ -46,10 +46,14 @@ if [ -f /etc/init.d/xvfb ] && [ ! -z "${RUN_XVFB}" ]; then # Make sure we're connecting to xvfb export DISPLAY=:99.0 + CXX11ABI="" + if [ `scripts/check-cxx11abi.sh` = 'ON' ]; then + CXX11ABI="-cxx11abi" + fi # Install and set up to load a more recent version of mesa mapbox_time "install_mesa" \ - mason install mesa 11.2.2 - export LD_LIBRARY_PATH="`mason prefix mesa 11.2.2`/lib:${LD_LIBRARY_PATH:-}" + mason install mesa 13.0.0-glx${CXX11ABI} + export LD_LIBRARY_PATH="`mason prefix mesa 13.0.0-glx${CXX11ABI}`/lib:${LD_LIBRARY_PATH:-}" fi # Install and set up to load awscli |