Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Handle uname -m returning arm64

Browse source
This commit is contained in:
Richard van der Hoff 2024-12-11 22:29:35 +00:00
parent 60ea133357
commit 5a2c1ae000
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/_developer_onboarding.md
View file

@ -132,7 +132,7 @@ Prerequisites:
``` ```
* Install the Android Rust toolchain for your machine's hardware: * 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 * Depending on the location of the Android SDK, you may need to set
`ANDROID_HOME`: `ANDROID_HOME`:

3
tools/sdk/build_rust_sdk.sh
View file

@ -60,6 +60,9 @@ buildApp=${buildApp:-no}
cd "${elementPwd}" cd "${elementPwd}"
default_arch="$(uname -m)-linux-android" 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 read -p "Enter the architecture you want to build for (default '$default_arch'): " target_arch
target_arch="${target_arch:-${default_arch}}" target_arch="${target_arch:-${default_arch}}"