From 65662f0491e33a208bf9d4c4e7a8ca0353f11d27 Mon Sep 17 00:00:00 2001
From: neargye <neargye@gmail.com>
Date: Sat, 24 Aug 2019 14:16:29 +0500
Subject: [PATCH] update ci

---
 .travis.yml | 33 ++++-----------------------------
 1 file changed, 4 insertions(+), 29 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b662c00..886dc32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,7 @@ matrix:
             - llvm-toolchain-xenial-5.0
           packages:
             - clang-5.0
+            - g++-7
       env:
         - CXX_COMPILER=clang++-5.0 CC_COMPILER=clang-5.0
 
@@ -38,6 +39,7 @@ matrix:
             - llvm-toolchain-xenial-6.0
           packages:
             - clang-6.0
+            - g++-7
       env:
         - CXX_COMPILER=clang++-6.0 CC_COMPILER=clang-6.0
 
@@ -50,6 +52,7 @@ matrix:
             - llvm-toolchain-xenial-7
           packages:
             - clang-7
+            - g++-7
       env:
         - CXX_COMPILER=clang++-7 CC_COMPILER=clang-7
 
@@ -62,6 +65,7 @@ matrix:
             - llvm-toolchain-xenial-8
           packages:
             - clang-8
+            - g++-7
       env:
         - CXX_COMPILER=clang++-8 CC_COMPILER=clang-8
 
@@ -81,35 +85,6 @@ install:
   - export CC=${CC_COMPILER}
   - export CXX=${CXX_COMPILER}
   - JOBS=2 # Travis machines have 2 cores.
-  - |
-    # If linux and clang install the right version of libc++.
-    if [[ "${TRAVIS_OS_NAME}" == "linux" && "${CXX%%+*}" == "clang" && -n "$(ls -A ${LLVM_INSTALL})" ]]; then
-      LLVM_INSTALL=${DEPS_DIR}/llvm/install
-      if   [[ "${CXX}" == "clang++-3.5" ]]; then LLVM_VERSION="3.5.2";
-      elif [[ "${CXX}" == "clang++-3.6" ]]; then LLVM_VERSION="3.6.2";
-      elif [[ "${CXX}" == "clang++-3.7" ]]; then LLVM_VERSION="3.7.1";
-      elif [[ "${CXX}" == "clang++-3.8" ]]; then LLVM_VERSION="3.8.1";
-      elif [[ "${CXX}" == "clang++-3.9" ]]; then LLVM_VERSION="3.9.1";
-      elif [[ "${CXX}" == "clang++-4.0" ]]; then LLVM_VERSION="4.0.1";
-      elif [[ "${CXX}" == "clang++-5.0" ]]; then LLVM_VERSION="5.0.2";
-      elif [[ "${CXX}" == "clang++-6.0" ]]; then LLVM_VERSION="6.0.1";
-      elif [[ "${CXX}" == "clang++-7" ]]; then LLVM_VERSION="7.0.1";
-      elif [[ "${CXX}" == "clang++-8" ]]; then LLVM_VERSION="8.0.1";
-      fi
-      LLVM_URL="http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz"
-      LIBCXX_URL="http://llvm.org/releases/${LLVM_VERSION}/libcxx-${LLVM_VERSION}.src.tar.xz"
-      LIBCXXABI_URL="http://llvm.org/releases/${LLVM_VERSION}/libcxxabi-${LLVM_VERSION}.src.tar.xz"
-      mkdir -p llvm llvm/build llvm/projects/libcxx llvm/projects/libcxxabi
-      travis_retry wget -O - ${LLVM_URL} | tar --strip-components=1 -xJ -C llvm
-      travis_retry wget -O - ${LIBCXX_URL} | tar --strip-components=1 -xJ -C llvm/projects/libcxx
-      travis_retry wget -O - ${LIBCXXABI_URL} | tar --strip-components=1 -xJ -C llvm/projects/libcxxabi
-      (cd llvm/build && cmake .. -DCMAKE_INSTALL_PREFIX=${LLVM_INSTALL})
-      (cd llvm/build/projects/libcxx && sudo make install -j${JOBS})
-      (cd llvm/build/projects/libcxxabi && sudo make install -j${JOBS})
-      export CXXFLAGS="-isystem ${LLVM_INSTALL}/include/c++/v1"
-      export LDFLAGS="-L ${LLVM_INSTALL}/lib -l c++ -l c++abi"
-      export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${LLVM_INSTALL}/lib"
-    fi
 
 before_script:
   - rm -rf build