From 2c460c05f4d0a8563fc9269e15c94728e2422074 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Thu, 20 Aug 2020 20:26:57 -0300
Subject: [PATCH] class/cargo: Handle case when host and target has same arch

When we have same architecture for the host and target, we need to
properly handle the native and target case as Rust cannot differentiate
both.

Fixes: #70.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 classes/cargo.bbclass | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/classes/cargo.bbclass b/classes/cargo.bbclass
index 8897297..1be0b43 100644
--- a/classes/cargo.bbclass
+++ b/classes/cargo.bbclass
@@ -48,14 +48,18 @@ CARGO_BUILD_FLAGS = "\
 "
 
 create_cargo_config() {
-    echo > ${CARGO_HOME}/config
-    echo "[target.${RUST_BUILD}]" >> ${CARGO_HOME}/config
-    echo "linker = '${WRAPPER_DIR}/linker-native-wrapper.sh'" >> ${CARGO_HOME}/config
-
     if [ "${RUST_BUILD}" != "${RUST_TARGET}" ]; then
+        echo > ${CARGO_HOME}/config
+        echo "[target.${RUST_BUILD}]" >> ${CARGO_HOME}/config
+        echo "linker = '${WRAPPER_DIR}/linker-native-wrapper.sh'" >> ${CARGO_HOME}/config
+
         echo >> ${CARGO_HOME}/config
         echo "[target.${RUST_TARGET}]" >> ${CARGO_HOME}/config
         echo "linker = '${WRAPPER_DIR}/linker-wrapper.sh'" >> ${CARGO_HOME}/config
+    else
+        echo > ${CARGO_HOME}/config
+        echo "[target.${RUST_TARGET}]" >> ${CARGO_HOME}/config
+        echo "linker = '${WRAPPER_DIR}/linker-wrapper.sh'" >> ${CARGO_HOME}/config
     fi
 
     echo >> ${CARGO_HOME}/config