From f1f3460d6fee5ca893014a98f5e863d37a72019c Mon Sep 17 00:00:00 2001 From: Fabian Beutel Date: Tue, 6 May 2025 20:15:37 +0200 Subject: [PATCH 1/2] Revert "Fix CC pointing to wrong compiler" This reverts commit 5a5370fc88cd0221d2c2e865c32d789eefccfbac. --- classes/cargo_bin.bbclass | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/classes/cargo_bin.bbclass b/classes/cargo_bin.bbclass index 7e3d909..258fbf3 100644 --- a/classes/cargo_bin.bbclass +++ b/classes/cargo_bin.bbclass @@ -96,10 +96,8 @@ cargo_bin_do_configure() { cargo_bin_do_compile() { export TARGET_CC="${WRAPPER_DIR}/cc-wrapper.sh" export TARGET_CXX="${WRAPPER_DIR}/cxx-wrapper.sh" - export CC="${WRAPPER_DIR}/cc-wrapper.sh" - export CXX="${WRAPPER_DIR}/cxx-wrapper.sh" - export BUILD_CC="${WRAPPER_DIR}/cc-native-wrapper.sh" - export BUILD_CXX="${WRAPPER_DIR}/cxx-native-wrapper.sh" + export CC="${WRAPPER_DIR}/cc-native-wrapper.sh" + export CXX="${WRAPPER_DIR}/cxx-native-wrapper.sh" export TARGET_LD="${WRAPPER_DIR}/linker-wrapper.sh" export LD="${WRAPPER_DIR}/linker-wrapper.sh" export PKG_CONFIG_ALLOW_CROSS="1" From db09d46b23a5ed696f349cdd11ce0c5b61704bfb Mon Sep 17 00:00:00 2001 From: Fabian Beutel Date: Tue, 6 May 2025 20:16:04 +0200 Subject: [PATCH 2/2] Revert "Also fix LD variable" This reverts commit b9b498be7e910ddf3603c60ddc9656353017d2ab. --- classes/cargo_bin.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/cargo_bin.bbclass b/classes/cargo_bin.bbclass index 258fbf3..2c0416d 100644 --- a/classes/cargo_bin.bbclass +++ b/classes/cargo_bin.bbclass @@ -99,7 +99,7 @@ cargo_bin_do_compile() { export CC="${WRAPPER_DIR}/cc-native-wrapper.sh" export CXX="${WRAPPER_DIR}/cxx-native-wrapper.sh" export TARGET_LD="${WRAPPER_DIR}/linker-wrapper.sh" - export LD="${WRAPPER_DIR}/linker-wrapper.sh" + export LD="${WRAPPER_DIR}/linker-native-wrapper.sh" export PKG_CONFIG_ALLOW_CROSS="1" export LDFLAGS="" export RUSTFLAGS="${RUSTFLAGS}"