From c43518484b141069d752582caa22628f785a9c43 Mon Sep 17 00:00:00 2001 From: DevMiner 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 | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b479586c3a..fb87d656a8e 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 fe1e7f88eab..51a9f839d93 100644 --- a/Cross.toml +++ b/Cross.toml @@ -1,12 +1,18 @@ [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"]