diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | scripts/build/build-travis.sh | 2 | ||||
| -rw-r--r-- | scripts/build/common-functions | 1 | ||||
| -rwxr-xr-x | scripts/build/klee.sh | 7 | ||||
| -rwxr-xr-x | scripts/build/llvm.sh | 15 |
5 files changed, 8 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index 36f43ebf..8abf5f14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,7 +90,7 @@ matrix: include: - os: osx osx_image: xcode8.3 - env: LLVM_VERSION=3.4 SOLVERS=STP:Z3 STP_VERSION=2.1.2 Z3_VERSION=4.4.1 KLEE_UCLIBC=0 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1 COVERAGE=0 USE_TCMALLOC=0 + env: LLVM_VERSION=4.0 SOLVERS=STP:Z3 STP_VERSION=2.1.2 Z3_VERSION=4.4.1 KLEE_UCLIBC=0 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1 COVERAGE=0 USE_TCMALLOC=0 cache: ccache: true diff --git a/scripts/build/build-travis.sh b/scripts/build/build-travis.sh index d887619a..eaa30822 100755 --- a/scripts/build/build-travis.sh +++ b/scripts/build/build-travis.sh @@ -5,8 +5,6 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DOCKER_BUILD_DEPS_ONLY=1 "${KLEE_SRC_TRAVIS}/scripts/build/build-docker.sh" elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - brew tap klee/klee - brew update brew install ccache set +e brew install python@2 diff --git a/scripts/build/common-functions b/scripts/build/common-functions index 45c94fef..499b51b7 100644 --- a/scripts/build/common-functions +++ b/scripts/build/common-functions @@ -112,6 +112,7 @@ done # that need to retrieve llvm-specifi variables LLVM_VERSION_SHORT="${LLVM_VERSION/./}" +LLVM_VERSION_MAJOR="${LLVM_VERSION/.*/}" LLVM_SUFFIX="" BuildMode='' diff --git a/scripts/build/klee.sh b/scripts/build/klee.sh index 517318f8..84d7bd63 100755 --- a/scripts/build/klee.sh +++ b/scripts/build/klee.sh @@ -26,10 +26,11 @@ if [[ "$TRAVIS_OS_NAME" = "linux" ]] ; then KLEE_CC="${LLVM_BIN}/clang" KLEE_CXX="${LLVM_BIN}/clang++" elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then - LLVM_CONFIG="/usr/local/bin/llvm-config-${LLVM_VERSION}" + LLVM_BIN="/usr/local/opt/llvm@${LLVM_VERSION_MAJOR}/bin" + LLVM_CONFIG="${LLVM_BIN}/llvm-config" LLVM_BUILD_DIR="$(${LLVM_CONFIG} --src-root)" - KLEE_CC="/usr/local/bin/clang-${LLVM_VERSION}" - KLEE_CXX="/usr/local/bin/clang++-${LLVM_VERSION}" + KLEE_CC="${LLVM_BIN}/clang" + KLEE_CXX="${LLVM_BIN}/clang++" else echo "Unhandled TRAVIS_OS_NAME \"${TRAVIS_OS_NAME}\"" exit 1 diff --git a/scripts/build/llvm.sh b/scripts/build/llvm.sh index cae64dd1..92370159 100755 --- a/scripts/build/llvm.sh +++ b/scripts/build/llvm.sh @@ -185,19 +185,8 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then rm -rf "${LLVM_BASE}" fi elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then - # We use our own local cache if possible - set +e - brew install "$HOME"/Library/Caches/Homebrew/llvm\@${LLVM_VERSION}*.bottle.tar.gz - RES=$? - set -ev - if [ ${RES} -ne 0 ]; then - # This might build the llvm package use a time out to avoid dumping log information - brew install -v --build-bottle "llvm@${LLVM_VERSION}" - # Now bottle the brew - brew bottle llvm\@${LLVM_VERSION} - # Not make sure it's cached - cp llvm\@${LLVM_VERSION}*.bottle.tar.gz $HOME/Library/Caches/Homebrew/ - fi + # Use the brew provided package + brew install "llvm\@${LLVM_VERSION_MAJOR}" else echo "Unhandled TRAVIS_OS_NAME \"${TRAVIS_OS_NAME}\"" exit 1 |