From 75b57ab960b6d80f1c0dd77d076646909510a87b Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 14 Mar 2016 10:21:35 -0700 Subject: [PATCH] [circleci] use clang-3.7 --- circle.yml | 9 +++++---- scripts/circleci.sh | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/circle.yml b/circle.yml index 705b334b3..64984dc40 100644 --- a/circle.yml +++ b/circle.yml @@ -7,6 +7,7 @@ machine: JOBS: 8 CCACHE_TEMPDIR: /tmp/.ccache-temp CCACHE_COMPRESS: 1 + LLVM_VERSION: 3.7 pre: - echo "here" post: @@ -17,14 +18,14 @@ dependencies: - "~/.ccache" pre: - sudo wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - - - sudo add-apt-repository -y "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.8 main" + - sudo add-apt-repository -y "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-${LLVM_VERSION} main" - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - sudo apt-get update -y override: - - sudo apt-get install clang-3.8 -y + - sudo apt-get install clang-${LLVM_VERSION} -y post: - - which clang-3.8 - - which clang++-3.8 + - which clang-${LLVM_VERSION} + - which clang++-${LLVM_VERSION} test: diff --git a/scripts/circleci.sh b/scripts/circleci.sh index 25d8f438a..ebf09c229 100755 --- a/scripts/circleci.sh +++ b/scripts/circleci.sh @@ -7,6 +7,6 @@ source bootstrap.sh ccache --version ccache -p || true ccache --show-stats || true -./configure CC="clang-3.8" CXX="ccache clang++-3.8 -Qunused-arguments" +./configure CC="clang-${LLVM_VERSION}" CXX="ccache clang++-${LLVM_VERSION} -Qunused-arguments" make make test \ No newline at end of file