From: Harish Sadineni <[email protected]>

YOCTO [#15061]
The rust target and linker are getting setting from the sdk environment and
so the config file is not needed. The redundant config file geneartion is 
removed.

Backport from oe-core master: 
https://git.openembedded.org/openembedded-core/commit/?id=d5f78816d2ad0f3e43ce883eef199d1683cfcbb4

Signed-off-by: Harish Sadineni <[email protected]>
Signed-off-by: Steve Sakoman <[email protected]>
---
 meta/recipes-devtools/rust/rust-cross-canadian.inc | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc 
b/meta/recipes-devtools/rust/rust-cross-canadian.inc
index 4e2e051f1d..dbf997560b 100644
--- a/meta/recipes-devtools/rust/rust-cross-canadian.inc
+++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc
@@ -64,20 +64,6 @@ do_install () {
 
     chown -R root.root ${D}
 
-    CARGO_ENV_SETUP_SH="${ENV_SETUP_DIR}/cargo.sh"
-    cat <<- EOF > "${CARGO_ENV_SETUP_SH}"
-       export CARGO_HOME="\$OECORE_TARGET_SYSROOT/home/cargo"
-       mkdir -p "\$CARGO_HOME"
-        # Init the default target once, it might be otherwise user modified.
-       if [ ! -f "\$CARGO_HOME/config" ]; then
-               touch "\$CARGO_HOME/config"
-               echo "[build]" >> "\$CARGO_HOME/config"
-               echo 'target = "'${RUST_TARGET_SYS}'"' >> "\$CARGO_HOME/config"
-               echo '# TARGET_SYS' >> "\$CARGO_HOME/config"
-               echo '[target.'${RUST_TARGET_SYS}']' >> "\$CARGO_HOME/config"
-               echo 'linker = "target-rust-ccld"' >> "\$CARGO_HOME/config"
-    fi
-       EOF
 }
 
 FILES:${PN} += "${base_prefix}/environment-setup.d"
-- 
2.43.0

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

Reply via email to