corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1726453 - Don't set LLVM_LIBDIR_SUFFIX=64 when building android-cross clang. r=firefox-build-system-reviewers,mhentges

Browse Source 
It's an unnecessary difference with our other clang builds. It looks
like it was cargo-culted from some external script. It makes the
android-cross clang different in the way it finds e.g. compiler
runtimes, some of which are in lib/, and others in lib64/, and only the
latter are actually found.

Differential Revision: https://phabricator.services.mozilla.com/D123017
This commit is contained in:
Mike Hommey
2021-08-20 03:56:12 +00:00
parent 1efa0d3a4e
commit 999e1095e7
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/build-clang/build-clang.py
View File

@@ -367,10 +367,6 @@ def build_one_stage(
# Android; we now have to provide all the necessary compiler switches to # Android; we now have to provide all the necessary compiler switches to
# make that work. # make that work.
if is_final_stage and android_targets: if is_final_stage and android_targets:
cmake_args += [
"-DLLVM_LIBDIR_SUFFIX=64",
]
android_link_flags = "-fuse-ld=lld" android_link_flags = "-fuse-ld=lld"
for target, cfg in android_targets.items(): for target, cfg in android_targets.items():

2
mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan
View File

@@ -19,7 +19,7 @@ unset ENABLE_CLANG_PLUGIN
# Add the path to the clang_rt used, so it can be packaged with the build. # Add the path to the clang_rt used, so it can be packaged with the build.
if [ -d "$MOZ_FETCHES_DIR/clang" ]; then if [ -d "$MOZ_FETCHES_DIR/clang" ]; then
CLANG_LIB_DIR="$(cd $MOZ_FETCHES_DIR/clang/lib64/clang/*/lib/linux && pwd)" CLANG_LIB_DIR="$(cd $MOZ_FETCHES_DIR/clang/lib/clang/*/lib/linux && pwd)"
export MOZ_CLANG_RT_ASAN_LIB_PATH="${CLANG_LIB_DIR}/libclang_rt.asan-x86_64-android.so" export MOZ_CLANG_RT_ASAN_LIB_PATH="${CLANG_LIB_DIR}/libclang_rt.asan-x86_64-android.so"
fi fi