[OE-core] [PATCH v2 2/2] cargo-cross-canadian: Use SDK's flags during target linking

[Otavio Salvador]

Signed-off-by: Otavio Salvador <ota...@ossystems.com.br>
---

(no changes since v1)

 .../cargo/cargo-cross-canadian.inc            | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/cargo/cargo-cross-canadian.inc 
b/meta/recipes-devtools/cargo/cargo-cross-canadian.inc
index 7fc22a4128..01ba151d0a 100644
--- a/meta/recipes-devtools/cargo/cargo-cross-canadian.inc
+++ b/meta/recipes-devtools/cargo/cargo-cross-canadian.inc
@@ -39,6 +39,18 @@ do_compile:prepend () {
        
PKG_CONFIG_PATH="${RECIPE_SYSROOT_NATIVE}/usr/lib/pkgconfig:${PKG_CONFIG_PATH}"
 }
 
+create_sdk_wrapper () {
+        file="$1"
+        shift
+
+        cat <<- EOF > "${file}"
+               #!/bin/sh
+               \$$1 \$@
+               EOF
+
+        chmod +x "$file"
+}
+
 do_install () {
     SYS_BINDIR=$(dirname ${D}${bindir})
     install -d "${SYS_BINDIR}"
@@ -47,6 +59,9 @@ do_install () {
        chrpath -r "\$ORIGIN/../lib" ${i}
     done
 
+    # Uses SDK's CC as linker so linked binaries works out of box.
+    create_sdk_wrapper "${SYS_BINDIR}/target-rust-ccld" "CC"
+
     ENV_SETUP_DIR=${D}${base_prefix}/environment-setup.d
     mkdir "${ENV_SETUP_DIR}"
     ENV_SETUP_SH="${ENV_SETUP_DIR}/cargo.sh"
@@ -58,7 +73,10 @@ do_install () {
                touch "\$CARGO_HOME/config"
                echo "[build]" >> "\$CARGO_HOME/config"
                echo 'target = "'${TARGET_SYS}'"' >> "\$CARGO_HOME/config"
-        fi
+               echo '# TARGET_SYS' >> "\$CARGO_HOME/config"
+               echo '[target.'${TARGET_SYS}']' >> "\$CARGO_HOME/config"
+               echo 'linker = "target-rust-ccld"' >> "\$CARGO_HOME/config"
+    fi
 
        # Keep the below off as long as HTTP/2 is disabled.
        export CARGO_HTTP_MULTIPLEXING=false
-- 
2.36.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#167849): 
https://lists.openembedded.org/g/openembedded-core/message/167849
Mute This Topic: https://lists.openembedded.org/mt/92292892/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-