From 41b68b91414d0cb5dd716bf6af4c4d826495809d Mon Sep 17 00:00:00 2001
From: DevMiner <devminer@devminer.xyz>
Date: Fri, 16 Aug 2024 19:45:39 +0200
Subject: [PATCH] chore: bump arm64 GCC to 9.4

Bump the arm64 cross compile image to `edge`.
---
 CHANGELOG.md        |  1 +
 Cross.toml          | 16 +++++++++++++---
 rust-toolchain.toml | 11 +++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 rust-toolchain.toml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b479586c3..fb87d656a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 **Internal**:
 
 - Bumped `sentry-native` submodule to v0.7.8. ([#3940](https://github.com/getsentry/relay/pull/3940))
+- Bumped arm64 cross compile image to `edge` tag. ([#3943](https://github.com/getsentry/relay/pull/3943))
 
 ## 24.8.0
 
diff --git a/Cross.toml b/Cross.toml
index fe1e7f88ea..3d803f0773 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,12 +1,22 @@
 [build]
 pre-build = [
-    # Use azure mirrors for faster downloads.
+    # Use Azure mirrors for faster downloads
     "sed -i -e 's/archive.archive.ubuntu.com/azure.archive.ubuntu.com/' /etc/apt/sources.list",
     "sed -i -e 's/security.archive.ubuntu.com/azure.archive.ubuntu.com/' /etc/apt/sources.list",
-    "apt-get update && apt-get --assume-yes install libclang-8-dev clang-8",
+
+    # Enable multiarch and install the necessary dependencies
+    "dpkg --add-architecture $CROSS_DEB_ARCH",
+    "apt-get update",
+    "apt-get -y install libclang-8-dev clang-8 zlib1g-dev:$CROSS_DEB_ARCH",
+
     "curl -sL https://sentry.io/get-cli/ | sh",
 ]
 
 [target.aarch64-unknown-linux-gnu]
 # We're using a nightly `cross`, let's still use a stable image.
-image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:0.2.5"
+image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:edge"
+env.passthrough = [
+    "CMAKE_TOOLCHAIN_FILE_aarch64_unknown_linux_gnu=",
+    "CXX=/usr/aarch64-linux-gnu/bin/g++",
+    "CC=/usr/aarch64-linux-gnu/bin/gcc",
+]
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 0000000000..38d57bfba8
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,11 @@
+[toolchain]
+channel = "1.80.1"
+profile = "default"
+components = [
+    "rustc",
+    "cargo",
+    "clippy",
+    "rustfmt",
+    "rust-analyzer",
+    "rust-src",
+]