Skip to contentSkip to conversation

rust: Do not modify rpaths in llvm-config

PATCH New Khem Raj 1 participant 1 message Oct 22, 2025

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 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

Cc Deepesh Varatharajan <[email protected]>
---
 meta/recipes-devtools/rust/rust_1.90.0.bb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
meta/recipes-devtools/rust/rust_1.90.0.bb +1 -5
index 0319d73b930..e7f3985332d 100644
@@ -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