From: Deepesh Varatharajan <[email protected]>

Target LLVM tools are installed in the sysroot for llvm-lit, which causes
Rust to pick up a target llvm-config that cannot run on the host. Overwrite
it with the native llvm-config so Rust can execute it correctly.

Signed-off-by: Deepesh Varatharajan <[email protected]>
---
 meta/recipes-devtools/rust/rust_1.92.0.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/rust/rust_1.92.0.bb 
b/meta/recipes-devtools/rust/rust_1.92.0.bb
index a25f65f674..b1d8597056 100644
--- a/meta/recipes-devtools/rust/rust_1.92.0.bb
+++ b/meta/recipes-devtools/rust/rust_1.92.0.bb
@@ -234,9 +234,10 @@ rust_runx () {
 
     # Copy the natively built llvm-config into the target so we can run it. 
Horrible,
     # but works!
-    if [ ${RUST_ALTERNATE_EXE_PATH_NATIVE} != ${RUST_ALTERNATE_EXE_PATH} -a ! 
-f ${RUST_ALTERNATE_EXE_PATH} ]; then
+    if [ ${RUST_ALTERNATE_EXE_PATH_NATIVE} != ${RUST_ALTERNATE_EXE_PATH} ]; 
then
         mkdir -p `dirname ${RUST_ALTERNATE_EXE_PATH}`
-        cp ${RUST_ALTERNATE_EXE_PATH_NATIVE} ${RUST_ALTERNATE_EXE_PATH}
+        rm -f ${RUST_ALTERNATE_EXE_PATH}
+        cp -f ${RUST_ALTERNATE_EXE_PATH_NATIVE} ${RUST_ALTERNATE_EXE_PATH}
         patchelf --remove-rpath ${RUST_ALTERNATE_EXE_PATH}
     fi
 
-- 
2.49.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#230457): 
https://lists.openembedded.org/g/openembedded-core/message/230457
Mute This Topic: https://lists.openembedded.org/mt/117615650/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to