From df2b6cfec1d3acb41520d1277809ba3d17a7ceb7 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 16 Jan 2017 18:19:54 -0800 Subject: [linux] No need for CXXABI suffix for mesa --- scripts/travis_setup.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'scripts') 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 -- cgit v1.2.1