aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkränzer <bernhard.rosenkranzer@linaro.org>2018-04-15 16:18:05 +0200
committerFathi Boudra <fathi.boudra@linaro.org>2018-04-15 17:01:18 +0000
commitd0e9cfffc33265d42e038bb2747427938e0caa26 (patch)
treea3366d16a437fde0813d5caa7aad4949f73d9208
parente22ad99c0e862cdfc9f7a739b45654b0659c16b3 (diff)
downloadlinaro-android-build-tools-master.tar.gz
android-clang-toolchain: adjust to current clang-master build changesHEADmaster
We no longer need to copy lib64 and prebuilt_include from AOSP clang when using clang-master. Copy only files that are still missing from our toolchain tarballs. Change-Id: I199e08354ec6f418b47b7706c29b54fb183b139f Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkranzer@linaro.org>
-rw-r--r--build-scripts/build-android19
1 files changed, 15 insertions, 4 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android
index b75e29d..69ecd64 100644
--- a/build-scripts/build-android
+++ b/build-scripts/build-android
@@ -202,12 +202,23 @@ else
[ -z $ANDROID_CLANGVER ] && ANDROID_CLANGVER=clang-4053586 # aosp prebuilt build number at 2017/10/11 master
mkdir -p $PWD/prebuilts/clang/host/linux-x86/clang-master
cp -r external_tarballs/$(basename ${CLANG_TOOLCHAIN_URL} .tar.xz)/* $PWD/prebuilts/clang/host/linux-x86/clang-master/
- for i in lib64 prebuilt_include test; do
- # mkdir -p $PWD/prebuilts/clang/host/linux-x86/clang-master/${i}
- # cp -af $PWD/prebuilts/clang/host/linux-x86/$ANDROID_CLANGVER/${i}/* $PWD/prebuilts/clang/host/linux-x86/clang-master/${i}/
+
+ export LLVM_PREBUILTS_VERSION=clang-master
+ export LLVM_RELEASE_VERSION=$(ls $PWD/prebuilts/clang/host/linux-x86/clang-master/lib64/clang/)
+
+ # ********** FIXME **********
+ # All the files being copied from the AOSP clang build
+ # should really be part of the toolchain tarball.
+ # Not done currently because they aren't generated by upstream
+ # clang's build process.
+ for i in test; do
ln -s $PWD/prebuilts/clang/host/linux-x86/$ANDROID_CLANGVER/${i} $PWD/prebuilts/clang/host/linux-x86/clang-master/${i}
done
- export LLVM_PREBUILTS_VERSION=clang-master
+ # This catches crosscompiled compiler-rt versions, libFuzzer,
+ # as well as symbol versioning files
+ for i in $PWD/prebuilts/clang/host/linux-x86/$ANDROID_CLANGVER/lib64/clang/*/lib/linux/*; do
+ [ -e "$PWD/prebuilts/clang/host/linux-x86/clang-master/lib64/clang/$LLVM_RELEASE_VERSION/lib/linux/$(basename $i)" ] || cp -a $i $PWD/prebuilts/clang/host/linux-x86/clang-master/lib64/clang/$LLVM_RELEASE_VERSION/lib/linux/
+ done
fi
if [ -x "${TARGET_TOOLS_PREFIX}gcc" ]; then