diff options
Diffstat (limited to 'build-prebuilts')
| -rwxr-xr-x | build-prebuilts | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/build-prebuilts b/build-prebuilts index 97101b4..3c99285 100755 --- a/build-prebuilts +++ b/build-prebuilts @@ -11,8 +11,8 @@ export OPTFLAGS="-O2" export WITH_TESTS=true NINJA_VERSION=1.7.2 -LLVM_REV=tags/RELEASE_401/final -CLANG_VERSION=4.0.1 +LLVM_REV=branches/release_50 #tags/RELEASE_401/final +CLANG_VERSION=5.0 #4.0.1 GO_VERSION=1.8 BINUTILS_VERSION=2.28 GCC_VERSION=linaro-snapshot-6.3-2017.05 @@ -109,7 +109,11 @@ else svn co http://llvm.org/svn/llvm-project/libcxx/$LLVM_REV llvm/projects/libcxx svn co http://llvm.org/svn/llvm-project/libcxxabi/$LLVM_REV llvm/projects/libcxxabi cd llvm - patch -p1 <$MYDIR/llvm-4.0-libc++-libc++abi-dependency.patch + if [ $(echo $CLANG_VERSION |cut -d. -f1) -lt 5 ]; then + patch -p1 <$MYDIR/llvm-4.0-libc++-libc++abi-dependency.patch + else + patch -p1 <$MYDIR/llvm-5.0-libc++-libc++abi-dependency.patch + fi cd .. fi fi @@ -216,6 +220,10 @@ if $EVIL_WORKAROUND; then cp -af llvm/llvm/lib/Fuzzer/*.h ${OUTDIR}/prebuilts/clang/host/linux-x86/clang-${CLANG_VERSION}/prebuilt_include/llvm/lib/Fuzzer/ fi +# Inject soong related build files that aren't part of llvm/clang +[ -d linux-x86 ] || git clone --depth 1 https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86 +cp -a linux-x86/soong ${OUTDIR}/prebuilts/clang/host/$OS-$ARCH/clang-${CLANG_VERSION}/ +[ "$ARCH" != "x86" ] && sed -i -e "s,x86,$ARCH,g" ${OUTDIR}/prebuilts/clang/host/$OS-$ARCH/clang-${CLANG_VERSION}/soong/* ############################################################################## ### Build go ### |