From 2ca23ec7fd3afb31d8dd7f6ade1f662385b18bb4 Mon Sep 17 00:00:00 2001 From: Ernst Persson Date: Thu, 9 Jan 2025 12:22:56 +0100 Subject: [PATCH] cargo_bin.bbclass: Minimize calls to rust_target Don't evaluate this inside a function definition. Fixes issues with "metadata is not deterministic". Fixes #195 --- classes/cargo_bin.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/cargo_bin.bbclass b/classes/cargo_bin.bbclass index 2c0416d..83e7ba3 100644 --- a/classes/cargo_bin.bbclass +++ b/classes/cargo_bin.bbclass @@ -19,6 +19,7 @@ export CARGO_TARGET_DIR = "${B}" RUST_TARGET = "${@rust_target(d, 'TARGET')}" RUST_BUILD = "${@rust_target(d, 'BUILD')}" +CARGO_TARGET_LINKER_NAME = "${@d.getVar('RUST_TARGET', True).replace('-','_').upper()}" # Additional flags passed directly to the "cargo build" invocation EXTRA_CARGO_FLAGS ??= "" @@ -112,7 +113,7 @@ cargo_bin_do_compile() { export CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" export CARGO_UNSTABLE_HOST_CONFIG="true" export CARGO_TARGET_APPLIES_TO_HOST="false" - export CARGO_TARGET_${@rust_target(d, 'TARGET').replace('-','_').upper()}_LINKER="${WRAPPER_DIR}/linker-wrapper.sh" + export CARGO_TARGET_${CARGO_TARGET_LINKER_NAME}_LINKER="${WRAPPER_DIR}/linker-wrapper.sh" export CARGO_HOST_LINKER="${WRAPPER_DIR}/linker-native-wrapper.sh" export CARGO_BUILD_FLAGS="-C rpath" export CARGO_PROFILE_RELEASE_DEBUG="true"