diff options
| author | Harish Sadineni <Harish.Sadineni@windriver.com> | 2025-02-06 03:53:18 -0800 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2025-02-12 06:25:37 -0800 |
| commit | fbaa6a601fe459043aefdf50aed07a7956a959b5 (patch) | |
| tree | 871d5075c7f4391080fe6abe1cc71eee52b62912 /meta/recipes-devtools/rust | |
| parent | c61736066eaa405dcebcd9721500570004560b21 (diff) | |
| download | poky-fbaa6a601fe459043aefdf50aed07a7956a959b5.tar.gz | |
rust: remove redundant cargo config file
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
(From OE-Core rev: 12fd08cf4009d0284ab951cc48a479dcbc74db42)
Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-devtools/rust')
| -rw-r--r-- | meta/recipes-devtools/rust/rust-cross-canadian.inc | 14 |
1 files changed, 0 insertions, 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 () { | |||
| 64 | 64 | ||
| 65 | chown -R root.root ${D} | 65 | chown -R root.root ${D} |
| 66 | 66 | ||
| 67 | CARGO_ENV_SETUP_SH="${ENV_SETUP_DIR}/cargo.sh" | ||
| 68 | cat <<- EOF > "${CARGO_ENV_SETUP_SH}" | ||
| 69 | export CARGO_HOME="\$OECORE_TARGET_SYSROOT/home/cargo" | ||
| 70 | mkdir -p "\$CARGO_HOME" | ||
| 71 | # Init the default target once, it might be otherwise user modified. | ||
| 72 | if [ ! -f "\$CARGO_HOME/config" ]; then | ||
| 73 | touch "\$CARGO_HOME/config" | ||
| 74 | echo "[build]" >> "\$CARGO_HOME/config" | ||
| 75 | echo 'target = "'${RUST_TARGET_SYS}'"' >> "\$CARGO_HOME/config" | ||
| 76 | echo '# TARGET_SYS' >> "\$CARGO_HOME/config" | ||
| 77 | echo '[target.'${RUST_TARGET_SYS}']' >> "\$CARGO_HOME/config" | ||
| 78 | echo 'linker = "target-rust-ccld"' >> "\$CARGO_HOME/config" | ||
| 79 | fi | ||
| 80 | EOF | ||
| 81 | } | 67 | } |
| 82 | 68 | ||
| 83 | FILES:${PN} += "${base_prefix}/environment-setup.d" | 69 | FILES:${PN} += "${base_prefix}/environment-setup.d" |
