Merge pull request #197 from antoinefaure/wrong_cc_used

Fix CC pointing to wrong compiler
rust-embedded · Feb 7, 2025 · 96c802d · 96c802d
2 parents c433ca7 + b9b498b
commit 96c802d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/classes/cargo_bin.bbclass b/classes/cargo_bin.bbclass
@@ -96,10 +96,12 @@ 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-native-wrapper.sh"
-    export CXX="${WRAPPER_DIR}/cxx-native-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 TARGET_LD="${WRAPPER_DIR}/linker-wrapper.sh"
-    export LD="${WRAPPER_DIR}/linker-native-wrapper.sh"
+    export LD="${WRAPPER_DIR}/linker-wrapper.sh"
     export PKG_CONFIG_ALLOW_CROSS="1"
     export LDFLAGS=""
     export RUSTFLAGS="${RUSTFLAGS}"