From 3363fbcfcbab3762f7094acee4c9980694733d53 Mon Sep 17 00:00:00 2001
From: finn <finn@janky.solutions>
Date: Tue, 20 Dec 2022 01:44:56 -0800
Subject: [PATCH] maybe just needs this?

---
 .gitlab-ci.yml | 8 ++++++--
 prepare-env.sh | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56b277d..d15112a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,12 +40,16 @@ compile:
     - git clone https://github.com/signalapp/libsignal-client
     - cd libsignal-client && git checkout "$libsignal_version"
     - rustup set profile minimal
+    - rustup toolchain install nightly
     - rustup target add "${TARGET}"
     - if [[ -d ../target ]]; then mv ../target target; fi
-    - RUSTFLAGS="$(../rustflags.sh)" cargo build --target "${TARGET}" --release --verbose
-    - RUSTFLAGS="$(../rustflags.sh)" cargo build -p libsignal-jni --target "${TARGET}" --release --verbose
+    - RUSTFLAGS="$(../rustflags.sh)" CARGO_BUILD_TARGET=${TARGET} cargo build  -p libsignal-jni --target "${TARGET}" --release --verbose
     - cp -v target/${TARGET}/release/libsignal_jni.so ../libsignal_jni-${TARGET}.so
     - cp target/ ../target
+  variables:
+    CC: aarch64-linux-gnu-gcc
+    CXX: aarch64-linux-gnu-g++
+    CPATH: /usr/aarch64-linux-gnu/include
   cache:
     paths:
       - target/
diff --git a/prepare-env.sh b/prepare-env.sh
index 159f069..5be01b6 100755
--- a/prepare-env.sh
+++ b/prepare-env.sh
@@ -5,9 +5,9 @@ apt-get update
 
 PACKAGES=("git" "clang-13" "libclang-dev" "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
-    # ;;
+    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
+    ;;
     arm-unknown-linux-gnueabi|arm-unknown-linux-musleabi)
         apt-get install -yqq "${PACKAGES[@]}" {cpp,g++,gcc}-arm-linux-gnueabi linux-libc-dev-armel-cross
     ;;