diff options
| author | Bernhard Rosenkränzer <bernhard.rosenkranzer@linaro.org> | 2018-04-13 15:33:29 +0200 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2018-04-13 15:20:55 +0000 |
| commit | 8421e9e392e99e3be29f5af5bd0c19f549b9954e (patch) | |
| tree | 18d3fa6a1549b9f7a87b49a2ee8ae7b9a20aafbf /android-clang-toolchain | |
| parent | 846ebf2139d4497bd38db4db5127a9cff7cdcf18 (diff) | |
Bootstrap with clang+llvm 6.0.0
No point in keeping 5.0.0 now that 6.0.0 is released
Change-Id: Ifdfb8003d27ba9c0ef87ed2bd46300aa4f87a570
Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkranzer@linaro.org>
Diffstat (limited to 'android-clang-toolchain')
| -rwxr-xr-x | android-clang-toolchain/builders.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/android-clang-toolchain/builders.sh b/android-clang-toolchain/builders.sh index f8cd2100..2fefdfca 100755 --- a/android-clang-toolchain/builders.sh +++ b/android-clang-toolchain/builders.sh @@ -32,9 +32,9 @@ else fi # Toolchain download -if [ ! -d clang+llvm-5.0.0-linux-x86_64-ubuntu14.04 ]; then - wget http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz - tar xvfJ clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz +if [ ! -d clang+llvm-6.0.0-x86_64-linux-gnu-ubuntu-14.04 ]; then + wget http://releases.llvm.org/6.0.0/clang+llvm-6.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz + tar xvfJ clang+llvm-6.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz fi # Temporary clang patch for 25b45aa81854313486df891985cdd7ef1ec09780 @@ -52,8 +52,8 @@ cmake -G "Unix Makefiles" ../ \ -DCMAKE_INSTALL_PREFIX=./clang-master \ -DLLVM_TARGETS_TO_BUILD="host;ARM;X86;AArch64" \ -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++ \ + -DCMAKE_C_COMPILER=${HOME}/srv/aosp/${JOB_NAME}/clang+llvm-6.0.0-x86_64-linux-gnu-ubuntu-14.04/bin/clang \ + -DCMAKE_CXX_COMPILER=${HOME}/srv/aosp/${JOB_NAME}/clang+llvm-6.0.0-x86_64-linux-gnu-ubuntu-14.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 |