From 575d04e122d69fdfa326b0db673ea02d7b8c5d08 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 24 Jul 2024 13:13:49 +0800 Subject: [PATCH] chromium: fix do_copy_clang_library failed for multilib Due to commit [clang: use nonarch_libdir/clang for all runtime files][1] applied, the clang runtime libraries was installed to ${nonarch_libdir}, no matter the value of libdir Tweak it for do_copy_clang_library, use ${nonarch_libdir} to instead [1] https://github.com/kraj/meta-clang/commit/cda1376a97b86d6ae5c92fd931f9583430c73885 Signed-off-by: Hongxu Jia --- meta-chromium/recipes-browser/chromium/chromium-gn.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-chromium/recipes-browser/chromium/chromium-gn.inc b/meta-chromium/recipes-browser/chromium/chromium-gn.inc index acb344254..7e0234f00 100644 --- a/meta-chromium/recipes-browser/chromium/chromium-gn.inc +++ b/meta-chromium/recipes-browser/chromium/chromium-gn.inc @@ -457,7 +457,7 @@ do_copy_clang_library () { # Chromium needs to link against libclang_rt.builtins.a for both host and # target code, and expects to find both libraries in the same directory # (thanks to 0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch). - cd "${STAGING_LIBDIR}/clang" + cd "${STAGING_DIR_HOST}${nonarch_libdir}/clang" # lib_file = "./$CLANG_VERSION/lib/linux/libclang_rt.builtins-$ARCH.a" lib_file="$(find . -name 'libclang_rt.builtins*')" # stripped_lib_file = "lib/linux/libclang_rt.builtins-$ARCH.a"