fix(ci): Match any clang binary

This commit is contained in:
Michael Carlberg 2016-12-15 20:22:42 +01:00
parent 7a70ab8942
commit 5b544e9581
7 changed files with 9 additions and 9 deletions

View File

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/bash
cd "${TRAVIS_BUILD_DIR}/build" && make -j"${JOBS}" cd "${TRAVIS_BUILD_DIR}/build" && make -j"${JOBS}"

View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
mkdir -p "${TRAVIS_BUILD_DIR}/build" mkdir -p "${TRAVIS_BUILD_DIR}/build"
cd "${TRAVIS_BUILD_DIR}/build" || false cd "${TRAVIS_BUILD_DIR}/build" || false
cmake \ cmake \

View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
export DEPS_DIR="${TRAVIS_BUILD_DIR}/deps" export DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
export LLVM_ROOT="${DEPS_DIR}/llvm-${LLVM_VERSION}" export LLVM_ROOT="${DEPS_DIR}/llvm-${LLVM_VERSION}"
@ -6,7 +6,7 @@ mkdir -p "${DEPS_DIR}"
mkdir -p "${LLVM_ROOT}" mkdir -p "${LLVM_ROOT}"
# Update compiler flags # Update compiler flags
if [ "${CXX}" = "clang++" ]; then if [ "${CXX:0:7}" = "clang++" ]; then
export CXX="clang++-3.8" export CXX="clang++-3.8"
export CC="clang-3.8" export CC="clang-3.8"
export CXXFLAGS="${CXXFLAGS} -Qunused-arguments" export CXXFLAGS="${CXXFLAGS} -Qunused-arguments"

View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
if [ -z "$(ls -A "${DEPS_DIR}/cmake/bin" 2>/dev/null)" ]; then if [ -z "$(ls -A "${DEPS_DIR}/cmake/bin" 2>/dev/null)" ]; then
mkdir -p cmake && travis_retry wget --no-check-certificate --quiet -O - "${CMAKE_URL}" | tar --strip-components=1 -xz -C cmake mkdir -p cmake && travis_retry wget --no-check-certificate --quiet -O - "${CMAKE_URL}" | tar --strip-components=1 -xz -C cmake
fi fi

View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/bash
if [ "${CXX}" = "clang++" ]; then if [ "${CXX:0:7}" = "clang++" ]; then
if [ -z "$(ls -A "${LLVM_ROOT}/install/include" 2>/dev/null)" ]; then if [ -z "$(ls -A "${LLVM_ROOT}/install/include" 2>/dev/null)" ]; then
mkdir -p "${LLVM_ROOT}" "${LLVM_ROOT}/build" "${LLVM_ROOT}/projects/libcxx" "${LLVM_ROOT}/projects/libcxxabi" mkdir -p "${LLVM_ROOT}" "${LLVM_ROOT}/build" "${LLVM_ROOT}/projects/libcxx" "${LLVM_ROOT}/projects/libcxxabi"

View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
echo "${CXX} --version" echo "${CXX} --version"
eval "${CXX} --version" eval "${CXX} --version"

View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
if [ "${BUILD_TESTS:-OFF}" = "ON" ]; then if [ "${BUILD_TESTS:-OFF}" = "ON" ]; then
for test in tests/unit_test.*; do for test in tests/unit_test.*; do
[ -x "$test" ] || continue [ -x "$test" ] || continue