left some arch-specific stuff in there

.gitlab-ci.yml

@@ -43,13 +43,10 @@ compile:
     - rustup toolchain install nightly
     - rustup target add "${TARGET}"
     - if [[ -d ../target ]]; then mv ../target target; fi
-    - RUSTFLAGS="$(../rustflags.sh)" CARGO_BUILD_TARGET=${TARGET} cargo build  -p libsignal-jni --target "${TARGET}" --release --verbose
+    - . ../rustflags.sh
+    - cargo build  -p libsignal-jni --target "${TARGET}" --release --verbose
     - cp -v target/${TARGET}/release/libsignal_jni.so ../libsignal_jni-${TARGET}.so
     - cp -r target/ ../target
-  variables:
-    CC: aarch64-linux-gnu-gcc
-    CXX: aarch64-linux-gnu-g++
-    CPATH: /usr/aarch64-linux-gnu/include
   cache:
     paths:
       - target/

rustflags.sh

@@ -1,8 +1,32 @@
-#!/bin/bash
+#!/bin/bash -exuo pipefail
-flags="-C link-arg=-s"
+RUSTFLAGS="-C link-arg=-s"
 
 if [[ "${TARGET}" == *musl ]]; then 
-    flags="${flags} -C target-feature=-crt-static"
+    RUSTFLAGS="${flags} -C target-feature=-crt-static"
 fi
 
-echo "${flags}"
+export RUSTFLAGS="${RUSTFLAGS}"
+
+target_debian=""
+case "${TARGET}" in
+    aarch64-unknown-linux-gnu|aarch64-unknown-linux-musl)
+        target_debian="aarch64-linux-gnu"
+    ;;
+    arm-unknown-linux-gnueabi|arm-unknown-linux-musleabi)
+        target_debian="arm-linux-gnueabi"
+    ;;
+    arm-unknown-linux-gnueabihf|arm-unknown-linux-musleabihf)
+        target_debian="arm-linux-gnueabihf"
+    ;;
+    armv7-unknown-linux-gnueabihf|armv7-unknown-linux-musleabihf)
+        target_debian="arm-linux-gnueabihf"
+    ;;
+esac
+
+if [[ "${target_debian}" != "" ]]; then
+    export CC="${target_debian}-gcc"
+    export CCX="${target_debian}-g++"
+    export CPATH="/usr/${target_debian}/include"
+fi
+
+export CARGO_BUILD_TARGET="${TARGET}"