From 999e1095e71865cb1511fd65a57f689eb719338e Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 20 Aug 2021 03:56:12 +0000 Subject: [PATCH] Bug 1726453 - Don't set LLVM_LIBDIR_SUFFIX=64 when building android-cross clang. r=firefox-build-system-reviewers,mhentges 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 --- build/build-clang/build-clang.py | 4 ---- .../config/mozconfigs/android-x86_64/nightly-fuzzing-asan | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py index ed007ffe4029..8372d7c3d970 100755 --- a/build/build-clang/build-clang.py +++ b/build/build-clang/build-clang.py @@ -367,10 +367,6 @@ def build_one_stage( # Android; we now have to provide all the necessary compiler switches to # make that work. if is_final_stage and android_targets: - cmake_args += [ - "-DLLVM_LIBDIR_SUFFIX=64", - ] - android_link_flags = "-fuse-ld=lld" for target, cfg in android_targets.items(): diff --git a/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan b/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan index 1604c8a8eeef..5399d5e842ed 100644 --- a/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan +++ b/mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan @@ -19,7 +19,7 @@ unset ENABLE_CLANG_PLUGIN # Add the path to the clang_rt used, so it can be packaged with the build. 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" fi