From b79edf9a103451f4ce45761fb7254d45e9be8024 Mon Sep 17 00:00:00 2001 From: Linaro CI Date: Tue, 24 Oct 2017 00:41:06 +0100 Subject: Update for clang upstream build 1. In an attempt to fix errors in https://ci.linaro.org/job/android-clang-toolchain/155/consoleText 2. Remove the entire llvm repo to make sure that we have fresh source code. Change-Id: I41100865a7b01c97629c3566b3bb35240f02b472 --- android-clang-toolchain/builders.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'android-clang-toolchain') diff --git a/android-clang-toolchain/builders.sh b/android-clang-toolchain/builders.sh index 347e0f4011..b849e71e43 100755 --- a/android-clang-toolchain/builders.sh +++ b/android-clang-toolchain/builders.sh @@ -18,6 +18,9 @@ mkdir -p ${HOME}/srv/aosp/${JOB_NAME} cd ${HOME}/srv/aosp/${JOB_NAME} # Toolchain src downloads +if [ -d llvm ]; then + rm llvm -rf +fi repo init -u https://android-git.linaro.org/git/platform/manifest.git -b clang-build repo sync -j16 -c @@ -47,6 +50,8 @@ cmake -G "Unix Makefiles" ../ \ -DLLVM_ENABLE_ASSERTIONS=false \ -DCMAKE_C_COMPILER=${HOME}/srv/aosp/${JOB_NAME}/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04/bin/clang \ -DCMAKE_CXX_COMPILER=${HOME}/srv/aosp/${JOB_NAME}/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04/bin/clang++ \ + -DLIBCXXABI_LIBCXX_INCLUDES=${HOME}/srv/aosp/${JOB_NAME}/llvm/projects/libcxx/include \ + -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${HOME}/srv/aosp/${JOB_NAME}/llvm/projects/libcxxabi/include \ -DLLVM_BINUTILS_INCDIR=${HOME}/srv/aosp/${JOB_NAME}/binutils/binutils-2.27/include make install VERBOSE=1 -j"$(nproc)" -- cgit v1.2.3