From 81638564d91375258e782b524a605c3561f3d28c Mon Sep 17 00:00:00 2001
From: alexliluz <49665315+alexliluz@users.noreply.github.com>
Date: Fri, 31 Jul 2026 13:44:47 +0800
Subject: [PATCH] Fix SC2155 in Debian cross builds

---
 docker/Dockerfile.debian | 6 ++++--
 docker/Dockerfile.j2     | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian
index 38a25037..9e2e6016 100644
--- a/docker/Dockerfile.debian
+++ b/docker/Dockerfile.debian
@@ -100,7 +100,8 @@ RUN source /env-cargo && \
     # https://github.com/tonistiigi/xx/pull/108#issuecomment-3700635977
     # https://github.com/dani-garcia/vaultwarden/discussions/7522
     if xx-info is-cross; then \
-        export XX_RUSTFLAGS="-C link-arg=-Wl,-rpath-link,/usr/lib/$(xx-info triple)"; \
+        XX_RUSTFLAGS="-C link-arg=-Wl,-rpath-link,/usr/lib/$(xx-info triple)"; \
+        export XX_RUSTFLAGS; \
     fi && \
     PKG_CONFIG="$(command -v "$(xx-info)-pkg-config")" xx-cargo build --features ${DB} --profile "${CARGO_PROFILE}" && \
     find . -not -path "./target*" -delete
@@ -121,7 +122,8 @@ RUN source /env-cargo && \
     # https://github.com/tonistiigi/xx/pull/108#issuecomment-3700635977
     # https://github.com/dani-garcia/vaultwarden/discussions/7522
     if xx-info is-cross; then \
-        export XX_RUSTFLAGS="-C link-arg=-Wl,-rpath-link,/usr/lib/$(xx-info triple)"; \
+        XX_RUSTFLAGS="-C link-arg=-Wl,-rpath-link,/usr/lib/$(xx-info triple)"; \
+        export XX_RUSTFLAGS; \
     fi && \
     PKG_CONFIG="$(command -v "$(xx-info)-pkg-config")" xx-cargo build --features ${DB} --profile "${CARGO_PROFILE}" && \
     if [[ "${CARGO_PROFILE}" == "dev" ]] ; then \
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
index 87a06737..d8b9c8c6 100644
--- a/docker/Dockerfile.j2
+++ b/docker/Dockerfile.j2
@@ -32,7 +32,8 @@
     # https://github.com/tonistiigi/xx/pull/108#issuecomment-3700635977
     # https://github.com/dani-garcia/vaultwarden/discussions/7522
     if xx-info is-cross; then \
-        export XX_RUSTFLAGS="-C link-arg=-Wl,-rpath-link,/usr/lib/$(xx-info triple)"; \
+        XX_RUSTFLAGS="-C link-arg=-Wl,-rpath-link,/usr/lib/$(xx-info triple)"; \
+        export XX_RUSTFLAGS; \
     fi && \
     PKG_CONFIG="$(command -v "$(xx-info)-pkg-config")" xx-cargo build --features ${DB} --profile "${CARGO_PROFILE}"
 {%- endmacro %}