From 5a2c1ae0001c84e3aa878d28cda4e1ffcb29b3e4 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 11 Dec 2024 22:29:35 +0000
Subject: [PATCH] Handle `uname -m` returning arm64

---
 docs/_developer_onboarding.md | 2 +-
 tools/sdk/build_rust_sdk.sh   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/_developer_onboarding.md b/docs/_developer_onboarding.md
index 857bc6f44b..738bd12430 100644
--- a/docs/_developer_onboarding.md
+++ b/docs/_developer_onboarding.md
@@ -132,7 +132,7 @@ Prerequisites:
   ```
 * Install the Android Rust toolchain for your machine's hardware:
   ```
-  rustup target add `uname -m`-linux-android
+  rustup target add aarch64-linux-android x86_64-linux-android
   ```
 * Depending on the location of the Android SDK, you may need to set
   `ANDROID_HOME`:
diff --git a/tools/sdk/build_rust_sdk.sh b/tools/sdk/build_rust_sdk.sh
index be4745a909..7c65604167 100755
--- a/tools/sdk/build_rust_sdk.sh
+++ b/tools/sdk/build_rust_sdk.sh
@@ -60,6 +60,9 @@ buildApp=${buildApp:-no}
 cd "${elementPwd}"
 
 default_arch="$(uname -m)-linux-android"
+# On ARM MacOS, `uname -m` returns arm64, but the toolchain is called aarch64
+default_arch="${default_arch/arm64/aarch64}"
+
 read -p "Enter the architecture you want to build for (default '$default_arch'): " target_arch
 target_arch="${target_arch:-${default_arch}}"