mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
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 (From OE-Core rev: c91addea22c7e857e583a89d4597f6e676210e6b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user