From f30c295e1fa39aa075c0327c38ade3cdf5406136 Mon Sep 17 00:00:00 2001
From: Hermes Agent <gb+hermes@rfc1437.de>
Date: Fri, 14 Aug 2026 20:33:28 +0000
Subject: [PATCH] Override the exact x64 compiler variables.

---
 .gitea/workflows/release.yml            | 7 ++++---
 crates/bds-ui/tests/packaging_assets.rs | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index 92cf1a0..b387a11 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -166,10 +166,11 @@ jobs:
         run: |
           set -eu
           target=x86_64-unknown-linux-gnu
-          export CC_x86_64_unknown_linux_gnu="$PWD/.gitea/scripts/x86_64-linux-gnu-gcc-pic"
-          export CXX_x86_64_unknown_linux_gnu="$PWD/.gitea/scripts/x86_64-linux-gnu-g++-pic"
           unset ZSTD_SYS_USE_PKG_CONFIG
-          cargo +${RUST_TOOLCHAIN} build --release --locked --target "$target" \
+          env \
+            "CC_x86_64-unknown-linux-gnu=$PWD/.gitea/scripts/x86_64-linux-gnu-gcc-pic" \
+            "CXX_x86_64-unknown-linux-gnu=$PWD/.gitea/scripts/x86_64-linux-gnu-g++-pic" \
+            cargo +${RUST_TOOLCHAIN} build --release --locked --target "$target" \
             --package bds-ui --package bds-cli --package bds-mcp
           rust_lib_dir=$(rustc +${RUST_TOOLCHAIN} --target "$target" --print target-libdir)
           cargo +${RUST_TOOLCHAIN} run --locked --package bds-release -- package \
diff --git a/crates/bds-ui/tests/packaging_assets.rs b/crates/bds-ui/tests/packaging_assets.rs
index 579506a..e2f8dc2 100644
--- a/crates/bds-ui/tests/packaging_assets.rs
+++ b/crates/bds-ui/tests/packaging_assets.rs
@@ -148,8 +148,8 @@ fn tagged_releases_are_built_and_packaged_with_rust_tools() {
         "publish",
         "PKG_CONFIG_ALLOW_CROSS",
         "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER",
-        "export CC_x86_64_unknown_linux_gnu=\"$PWD/.gitea/scripts/x86_64-linux-gnu-gcc-pic\"",
-        "export CXX_x86_64_unknown_linux_gnu=\"$PWD/.gitea/scripts/x86_64-linux-gnu-g++-pic\"",
+        "CC_x86_64-unknown-linux-gnu=$PWD/.gitea/scripts/x86_64-linux-gnu-gcc-pic",
+        "CXX_x86_64-unknown-linux-gnu=$PWD/.gitea/scripts/x86_64-linux-gnu-g++-pic",
         "unset ZSTD_SYS_USE_PKG_CONFIG",
     ] {
         assert!(