From c91addea22c7e857e583a89d4597f6e676210e6b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 21 Oct 2025 21:53:51 -0700 Subject: [PATCH] rust: Do not modify rpaths in llvm-config No need to edit rpaths in llvm-config, this is not needed anymore because the llvm-config used is from standard install inside sysroot unlike when rust-llvm was used, where it was installed into its own location to avoid conflicts with llvm-config coming from llvm/clang Signed-off-by: Khem Raj Cc: Deepesh Varatharajan Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/rust/rust_1.90.0.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meta/recipes-devtools/rust/rust_1.90.0.bb b/meta/recipes-devtools/rust/rust_1.90.0.bb index 0319d73b93..e7f3985332 100644 --- a/meta/recipes-devtools/rust/rust_1.90.0.bb +++ b/meta/recipes-devtools/rust/rust_1.90.0.bb @@ -237,11 +237,7 @@ rust_runx () { if [ ${RUST_ALTERNATE_EXE_PATH_NATIVE} != ${RUST_ALTERNATE_EXE_PATH} -a ! -f ${RUST_ALTERNATE_EXE_PATH} ]; then mkdir -p `dirname ${RUST_ALTERNATE_EXE_PATH}` cp ${RUST_ALTERNATE_EXE_PATH_NATIVE} ${RUST_ALTERNATE_EXE_PATH} - if [ -e ${STAGING_LIBDIR_NATIVE}/libc++.so.1 ]; then - patchelf --set-rpath \$ORIGIN/../../../../../`basename ${STAGING_DIR_NATIVE}`${libdir_native} ${RUST_ALTERNATE_EXE_PATH} - else - patchelf --remove-rpath ${RUST_ALTERNATE_EXE_PATH} - fi + patchelf --remove-rpath ${RUST_ALTERNATE_EXE_PATH} fi oe_cargo_fix_env -- 2.47.3