From c2ad2b3dd747e7a8baa5ff2f9ade8edb92204aa6 Mon Sep 17 00:00:00 2001
From: Maxim De Clercq <maximdeclercq00@gmail.com>
Date: Sun, 23 Jan 2022 17:38:13 +0100
Subject: [PATCH] fix: pass sccache variables to cross container with
 build.env.passthrough

---
 Cross.toml     | 12 ++++++++++++
 cross/build.sh |  3 ---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Cross.toml b/Cross.toml
index 491efcb7..a989a98f 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,3 +1,15 @@
+[build.env]
+# CI uses an S3 endpoint to store sccache artifacts, so their config needs to
+# be available in the cross container as well
+passthrough = [
+    "RUSTC_WRAPPER",
+    "AWS_ACCESS_KEY_ID",
+    "AWS_SECRET_ACCESS_KEY",
+    "SCCACHE_BUCKET",
+    "SCCACHE_ENDPOINT",
+    "SCCACHE_S3_USE_SSL",
+]
+
 [target.aarch64-unknown-linux-musl]
 image = "rust-cross:aarch64-unknown-linux-musl"
 
diff --git a/cross/build.sh b/cross/build.sh
index 34082606..4a6d4493 100755
--- a/cross/build.sh
+++ b/cross/build.sh
@@ -22,9 +22,6 @@ $([[ $TARGET =~ arm ]] && echo 'ENV RUSTFLAGS="$RUSTFLAGS -Clink-arg=-lgcc -Clin
 # Strip symbols while compiling in release mode
 $([[ $@ =~ -r ]] && echo 'ENV RUSTFLAGS="$RUSTFLAGS -Clink-arg=-s"')
 
-# Support a rustc wrapper like sccache when cross-compiling
-ENV RUSTC_WRAPPER="$RUSTC_WRAPPER"
-
 # Make sure that rust-bindgen uses the correct include path when cross-compiling
 # See https://github.com/rust-lang/rust-bindgen#environment-variables for more information
 ENV BINDGEN_EXTRA_CLANG_ARGS="-I\$TARGET_PREFIX/include"