diff options
| author | Bernhard Rosenkränzer <bernhard.rosenkranzer@linaro.org> | 2018-04-15 15:02:02 +0200 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2018-04-15 13:38:08 +0000 |
| commit | ee4f6c98ca19eb78cd9aa4af5ec3544793d8e7ba (patch) | |
| tree | 78eec9eac917405e139ca4cd3a0a7c622258ac66 /android-clang-toolchain/builders.sh | |
| parent | 1854270a9a482db6d875bb8a2e8b593b48a53534 (diff) | |
android-clang-toolchain: put libraries into lib64
This is to match what upstream AOSP does and what soong hardcodes.
Currently the android-master-clang build creates a symlink from AOSP
prebuilt lib64 to make up for the "missing" lib64 bits; that's bogus and
may cause crashes on ABI changes.
Change-Id: I1ee2a0447d514c99e2ecd5ff6980e8c889bcb527
Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkranzer@linaro.org>
Diffstat (limited to 'android-clang-toolchain/builders.sh')
| -rwxr-xr-x | android-clang-toolchain/builders.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/android-clang-toolchain/builders.sh b/android-clang-toolchain/builders.sh index 1e410d8687..bc8c71c657 100755 --- a/android-clang-toolchain/builders.sh +++ b/android-clang-toolchain/builders.sh @@ -56,7 +56,9 @@ cmake -G Ninja ../ \ -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 + -DLLVM_BINUTILS_INCDIR=${HOME}/srv/aosp/${JOB_NAME}/binutils/binutils-2.27/include \ + -DLLVM_LIBDIR_SUFFIX=64 \ + -DCLANG_LIBDIR_SUFFIX=64 VERBOSE=1 ninja install |