summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMatthieu Darbois <mayeut@users.noreply.github.com>2016-08-06 12:26:46 +0200
committerGitHub <noreply@github.com>2016-08-06 12:26:46 +0200
commit5bb919a30e77ee2c96984883fe2cfb714b62bddc (patch)
tree92637971fc4e4ed495e3af71b7b9accbfd0ac415 /tools
parentb8bd1b0e07cf427b80eb0dc6823efebbdd1b8e5b (diff)
Reenable clang-3.9 build on travis (#806)
clang-3.9 is now available with apt add-on in travis-ci
Diffstat (limited to 'tools')
-rwxr-xr-xtools/travis-ci/install.sh30
1 files changed, 0 insertions, 30 deletions
diff --git a/tools/travis-ci/install.sh b/tools/travis-ci/install.sh
index 1a4c0bb9..003f8fa8 100755
--- a/tools/travis-ci/install.sh
+++ b/tools/travis-ci/install.sh
@@ -115,33 +115,3 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
fi
fi
fi
-
-# Install clang if necessary.
-# clang-3.4 is available on base image
-# For more up-to-date versions, use packages from http://llvm.org/apt
-# Cannot use addons.apt.packages because clang-3.9 is currently on hold
-# (see https://github.com/travis-ci/apt-package-whitelist/pull/2780 or https://github.com/travis-ci/apt-package-whitelist/pull/2770)
-# "sudo: required" should be set in .travis.yml matrix for those configurations
-if echo "${CC:-}" | egrep -q "^clang-3.[7-9]?$" ; then
- case "${CC:-}" in
- clang-3.7)
- echo "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.7 main" | sudo tee /etc/apt/sources.list.d/llvm.list
- ;;
- clang-3.8)
- echo "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.8 main" | sudo tee /etc/apt/sources.list.d/llvm.list
- ;;
- clang-3.9)
- echo "deb http://llvm.org/apt/precise/ llvm-toolchain-precise main" | sudo tee /etc/apt/sources.list.d/llvm.list
- ;;
- *)
- echo "We should never have been there. Exiting..."
- exit 1
- esac
- wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
-
- # On precise, ubuntu-toolchain ppa must be installed also (see http://llvm.org/apt)
- sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
-
- sudo apt-get update -qq
- sudo apt-get install "${CC:-}" -y
-fi