diff options
| author | onqtam <vik.kirilov@gmail.com> | 2016-06-26 20:09:50 +0300 |
|---|---|---|
| committer | onqtam <vik.kirilov@gmail.com> | 2016-09-21 15:46:09 +0300 |
| commit | 664a3a89af7f5644d3e198547f3395a0a500f21b (patch) | |
| tree | 624c57344d6be2012b4b3fedf022d0daef8a25e3 /.travis.yml | |
| parent | d2b92d4921a23da73684140247c412708d17685b (diff) | |
cmake wasn't the problem...
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/.travis.yml b/.travis.yml index 929a80e..7931a06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -156,7 +156,7 @@ matrix: sources: *apt_sources # Clang 3.7 - - env: COMPILER=clang++ LLVM_VERSION=3.7.1 HAS_ASAN_64=true HAS_UBSAN_64=true # no sanitizers - not even for 64 bit - https://llvm.org/bugs/show_bug.cgi?id=22757 + - env: COMPILER=clang++ LLVM_VERSION=3.7.1 HAS_ASAN_64=true HAS_UBSAN_64=true addons: &clang37 apt: #packages: ["clang-3.7", "valgrind", "g++-multilib", "libc6-dbg", "libc6-dbg:i386"] @@ -164,7 +164,7 @@ matrix: sources: *apt_sources # Clang 3.8 - - env: COMPILER=clang++ LLVM_VERSION=3.8.0 HAS_ASAN_64=true HAS_UBSAN_64=true # no sanitizers - not even for 64 bit - https://llvm.org/bugs/show_bug.cgi?id=22757 + - env: COMPILER=clang++ LLVM_VERSION=3.8.0 HAS_ASAN_64=true HAS_UBSAN_64=true addons: &clang38 apt: #packages: ["clang-3.8", "valgrind", "g++-multilib", "libc6-dbg", "libc6-dbg:i386"] @@ -269,15 +269,6 @@ install: - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps" - mkdir ${DEPS_DIR} && cd ${DEPS_DIR} ############################################################################ - # Install a recent CMake - ############################################################################ - - | - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then - CMAKE_URL="http://www.cmake.org/files/v3.3/cmake-3.3.2-Linux-x86_64.tar.gz" - mkdir cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake - export PATH=${DEPS_DIR}/cmake/bin:${PATH} - fi - ############################################################################ # Install Clang ############################################################################ - | @@ -291,17 +282,10 @@ install: ############################################################################ - | if [[ "${LLVM_VERSION}" != "" ]]; then - if [[ "${LLVM_VERSION}" != "trunk" ]]; then - 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" - TAR_FLAGS="-xJ" - else - LLVM_URL="https://github.com/llvm-mirror/llvm/archive/master.tar.gz" - LIBCXX_URL="https://github.com/llvm-mirror/libcxx/archive/master.tar.gz" - LIBCXXABI_URL="https://github.com/llvm-mirror/libcxxabi/archive/master.tar.gz" - TAR_FLAGS="-xz" - 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" + TAR_FLAGS="-xJ" mkdir -p llvm llvm/build llvm/projects/libcxx llvm/projects/libcxxabi travis_retry wget --quiet -O - ${LLVM_URL} | tar --strip-components=1 ${TAR_FLAGS} -C llvm travis_retry wget --quiet -O - ${LIBCXX_URL} | tar --strip-components=1 ${TAR_FLAGS} -C llvm/projects/libcxx @@ -314,7 +298,7 @@ install: export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DEPS_DIR}/llvm/install/lib" fi ############################################################################ - # Install GCC under OSX + # Install brew dependencies under OSX ############################################################################ - | if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then |