From 9685d23fc73e3266abd4a5a47669b9d321c53665 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Tue, 6 Nov 2018 17:23:25 -0500 Subject: [PATCH] choose clang 5.0.0 or 7.0.0 depending what's installed --- .travis/install.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index a8ebb9e1ca..69e833acbc 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -2,10 +2,17 @@ set -x # setup clang for clang tests using local clang installation -sudo ln -s /usr/local/clang-7.0.0/bin/clang /usr/bin/clang -sudo ln -s /usr/local/clang-7.0.0/bin/clang++ /usr/bin/clang++ -ls -l /usr/local/clang-7.0.0/bin/clang* /usr/bin/clang* + +if [ ! -f /usr/local/clang-5.0.0/bin/clang ]; then + echo "No Clang 5.0.0 trying 7.0.0" + sudo ln -s /usr/local/clang-7.0.0/bin/clang /usr/bin/clang + sudo ln -s /usr/local/clang-7.0.0/bin/clang++ /usr/bin/clang++ +else + echo "Clang 5.0.0" + sudo ln -s /usr/local/clang-5.0.0/bin/clang /usr/bin/clang + sudo ln -s /usr/local/clang-5.0.0/bin/clang++ /usr/bin/clang++ +fi # dependencies for gdc tests sudo apt-get -y install gdc