You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by ji...@apache.org on 2016/06/30 22:00:18 UTC

[2/9] incubator-quickstep git commit: Go back to using LLVM Apt repositories

Go back to using LLVM Apt repositories


Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/c0c13f67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/c0c13f67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/c0c13f67

Branch: refs/heads/adaptive-bloom-filters
Commit: c0c13f67e330ccc4b233d9fd9033453211d9c584
Parents: 714874c
Author: Navneet Potti <na...@gmail.com>
Authored: Mon Jun 27 11:06:58 2016 -0500
Committer: Navneet Potti <na...@gmail.com>
Committed: Mon Jun 27 11:06:58 2016 -0500

----------------------------------------------------------------------
 .travis.yml | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/c0c13f67/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index fce3ba0..54a0c8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,19 +20,6 @@ env:
   - BUILD_TYPE=Debug VECTOR_COPY_ELISION_LEVEL=selection
   - BUILD_TYPE=Release VECTOR_COPY_ELISION_LEVEL=selection
 
-before_install:
-  - LLVM_VERSION=3.7.1
-  - LLVM_ARCHIVE_PATH=$HOME/clang+llvm.tar.xz
-  - if [[ $CC = "clang" ]]; then
-      wget http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-14.04.tar.xz -O $LLVM_ARCHIVE_PATH;
-      mkdir -p $HOME/clang-$LLVM_VERSION;
-      tar xf $LLVM_ARCHIVE_PATH -C $HOME/clang-$LLVM_VERSION --strip-components 1;
-      ln -sf $HOME/clang-$LLVM_VERSION/bin/clang++ $HOME/clang-$LLVM_VERSION/bin/clang++-3.7;
-      export PATH=$HOME/clang-$LLVM_VERSION/bin:$PATH;
-      export CPPFLAGS="-I $HOME/clang-$LLVM_VERSION/include/c++/v1";
-      echo "Using clang at " `which $CC-3.7` " and $CXX at " `which $CXX-3.7`;
-    fi
-
 install:
   - if [ "$CC" = "gcc" ]; then
       export MAKE_JOBS=1;
@@ -91,9 +78,11 @@ addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
+      - llvm-toolchain-precise-3.7
     packages:
       - gcc-5
       - g++-5
+      - clang-3.7
       - binutils-gold
       - libprotobuf-dev
       - protobuf-compiler