You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by na...@apache.org on 2016/06/08 23:38:35 UTC

incubator-quickstep git commit: Add semicolons in multi-line if-statement

Repository: incubator-quickstep
Updated Branches:
  refs/heads/travis_llvm_fix 40f365630 -> b7792b14c


Add semicolons in multi-line if-statement


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

Branch: refs/heads/travis_llvm_fix
Commit: b7792b14c84e7d570fa815a92c8eedf039f4f20f
Parents: 40f3656
Author: Navneet Potti <na...@gmail.com>
Authored: Wed Jun 8 18:38:21 2016 -0500
Committer: Navneet Potti <na...@gmail.com>
Committed: Wed Jun 8 18:38:21 2016 -0500

----------------------------------------------------------------------
 .travis.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b7792b14/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index b86e3b2..0503bf2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,10 +24,11 @@ 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
-      export PATH=$HOME/clang+llvm/bin:$PATH
+      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;
+      export PATH=$HOME/clang+llvm/bin:$PATH;
+      export CPPFLAGS="-I $HOME/clang-$LLVM_VERSION/include/c++/v1";
     fi
 
 install:
@@ -48,9 +49,6 @@ install:
   - export DEBUG_FLAGS="-g0";
   - export RELEASE_FLAGS="-O0 -DNDEBUG";
   - export LINKER_FLAGS="-s"
-  - if [ "$CC" = "gcc" ]; then
-      export CPPFLAGS="-I $HOME/clang-$LLVM_VERSION/include/c++/v1"
-    fi
 
 before_script:
   - $CC --version