summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-09 15:55:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-09 22:42:04 +0100
commit0650f9c770cf675535fdfd04baa53dbc2c7a727b (patch)
tree7efce396914c12ecd6c67c1c4ff9c90df7ec14e6
parent7275846f45db90bdb35c75eec83e7e4c62f8ad0d (diff)
downloadpoky-0650f9c770cf675535fdfd04baa53dbc2c7a727b.tar.gz
rust-cross-canadian: Use shell from SDK, not the host
rust sets LD_LIBRARY_PATH which causes a lot of problems with host binaries conflicting with SDK libraries. By using sh/bash from the SDK we avoid those issues. [YOCTO #14878] (From OE-Core rev: dabd97e78a599a81c056c0f3291244f5afae44b0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/rust/rust-cross-canadian.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc b/meta/recipes-devtools/rust/rust-cross-canadian.inc
index 2b09661542..77d45a37a3 100644
--- a/meta/recipes-devtools/rust/rust-cross-canadian.inc
+++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc
@@ -7,12 +7,13 @@ LICENSE = "MIT"
7 7
8MODIFYTOS = "0" 8MODIFYTOS = "0"
9 9
10# Need to use our SDK's sh here, see #14878
10create_sdk_wrapper () { 11create_sdk_wrapper () {
11 file="$1" 12 file="$1"
12 shift 13 shift
13 14
14 cat <<- EOF > "${file}" 15 cat <<- EOF > "${file}"
15 #!/bin/sh 16 #!${base_prefix}/bin/sh
16 \$$1 \$@ 17 \$$1 \$@
17 EOF 18 EOF
18 19