diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-01-16 18:19:54 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-01-17 13:05:10 -0600 |
| commit | df2b6cfec1d3acb41520d1277809ba3d17a7ceb7 (patch) | |
| tree | f22b92b62262bec38fe71f8ec7bd87c76391b7d9 /scripts | |
| parent | 66582681150d478140857d5def2c9cafa2748397 (diff) | |
| download | qtlocation-mapboxgl-df2b6cfec1d3acb41520d1277809ba3d17a7ceb7.tar.gz | |
[linux] No need for CXXABI suffix for mesa
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis_setup.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/scripts/travis_setup.sh b/scripts/travis_setup.sh index 8551e1cb97..65a2945fdc 100755 --- a/scripts/travis_setup.sh +++ b/scripts/travis_setup.sh @@ -56,14 +56,10 @@ function mapbox_start_xvfb { export -f mapbox_start_xvfb function mapbox_export_mesa_library_path { - 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 13.0.0-glx${CXX11ABI} - export LD_LIBRARY_PATH="`mason prefix mesa 13.0.0-glx${CXX11ABI}`/lib:${LD_LIBRARY_PATH:-}" + mason install mesa 13.0.0-glx + export LD_LIBRARY_PATH="`mason prefix mesa 13.0.0-glx`/lib:${LD_LIBRARY_PATH:-}" } export -f mapbox_export_mesa_library_path |