From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 9 Aug 2022 14:55:55 +0000 (+0100)
Subject: rust-cross-canadian: Use shell from SDK, not the host
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3372
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dabd97e78a599a81c056c0f3291244f5afae44b0;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc b/meta/recipes-devtools/rust/rust-cross-canadian.inc
index 2b09661542d..77d45a37a31 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"
 
 MODIFYTOS = "0"
 
+# Need to use our SDK's sh here, see #14878
 create_sdk_wrapper () {
         file="$1"
         shift
 
         cat <<- EOF > "${file}"
-		#!/bin/sh
+		#!${base_prefix}/bin/sh
 		\$$1 \$@
 		EOF