From a9cded08de4a1ffeacafeb40732a344898d6384d Mon Sep 17 00:00:00 2001
From: finn <finn@janky.solutions>
Date: Tue, 20 Dec 2022 00:25:15 -0800
Subject: [PATCH] drop +stable, add gcc-multilib g++-multilib deps

---
 .gitlab-ci.yml | 4 ++--
 prepare-env.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9edee74..3e1b8e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,9 +39,9 @@ compile:
   script:
     - git clone https://github.com/signalapp/libsignal-client
     - cd libsignal-client && git checkout "$libsignal_version"
-    - rustup +stable target add "${TARGET}"
+    - rustup target add "${TARGET}"
     - if [[ -d ../target ]]; then mv ../target target; fi
-    - RUSTFLAGS="$(../rustflags.sh)" cargo +stable build -p libsignal-jni --target "${TARGET}" --release --verbose
+    - RUSTFLAGS="$(../rustflags.sh)" cargo build -p libsignal-jni --target "${TARGET}" --release --verbose
     - cp -v target/${TARGET}/release/libsignal_jni.so ../libsignal_jni-${TARGET}.so
     - cp target/ ../target
   cache:
diff --git a/prepare-env.sh b/prepare-env.sh
index 3f29342..af7e441 100755
--- a/prepare-env.sh
+++ b/prepare-env.sh
@@ -3,7 +3,7 @@ set -exuo pipefail
 
 apt-get update
 
-PACKAGES=("git" "clang-13" "libclang-dev" "lld-13" "cmake" "make")
+PACKAGES=("git" "clang-13" "libclang-dev" "lld-13" "cmake" "make" "gcc-multilib" "g++-multilib")
 case "${TARGET}" in
     aarch64-unknown-linux-gnu|aarch64-unknown-linux-musl)
         apt-get install -yqq "${PACKAGES[@]}" crossbuild-essential-arm64 gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu