Skip to content

Commit c6208b4

Browse files
authored
Merge pull request #82 from OSSystems/fix/issue-70
class/cargo: Handle case when host and target has same arch
2 parents bbb93af + 2c460c0 commit c6208b4

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

classes/cargo.bbclass

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,18 @@ CARGO_BUILD_FLAGS = "\
4848
"
4949

5050
create_cargo_config() {
51-
echo > ${CARGO_HOME}/config
52-
echo "[target.${RUST_BUILD}]" >> ${CARGO_HOME}/config
53-
echo "linker = '${WRAPPER_DIR}/linker-native-wrapper.sh'" >> ${CARGO_HOME}/config
54-
5551
if [ "${RUST_BUILD}" != "${RUST_TARGET}" ]; then
52+
echo > ${CARGO_HOME}/config
53+
echo "[target.${RUST_BUILD}]" >> ${CARGO_HOME}/config
54+
echo "linker = '${WRAPPER_DIR}/linker-native-wrapper.sh'" >> ${CARGO_HOME}/config
55+
5656
echo >> ${CARGO_HOME}/config
5757
echo "[target.${RUST_TARGET}]" >> ${CARGO_HOME}/config
5858
echo "linker = '${WRAPPER_DIR}/linker-wrapper.sh'" >> ${CARGO_HOME}/config
59+
else
60+
echo > ${CARGO_HOME}/config
61+
echo "[target.${RUST_TARGET}]" >> ${CARGO_HOME}/config
62+
echo "linker = '${WRAPPER_DIR}/linker-wrapper.sh'" >> ${CARGO_HOME}/config
5963
fi
6064

6165
echo >> ${CARGO_HOME}/config

0 commit comments

Comments
 (0)