]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
rust-cross-canadian: Use shell from SDK, not the host
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 9 Aug 2022 14:55:55 +0000 (15:55 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 9 Aug 2022 21:42:00 +0000 (22:42 +0100)
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>
meta/recipes-devtools/rust/rust-cross-canadian.inc

index 2b09661542da6ffb2146bd1cda5c800f32691d3d..77d45a37a317f8b52f960730bac7011ab29932f3 100644 (file)
@@ -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