From 34f076e18863d5525d48cebd620b84476a9debb9 Mon Sep 17 00:00:00 2001
From: finn <finn@janky.solutions>
Date: Mon, 19 Dec 2022 19:30:51 -0800
Subject: [PATCH] export some variables

---
 .gitlab-ci.yml | 16 ++++++++++++++++
 prepare-env.sh | 12 ++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f99af84..9bb6a0e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,6 +41,22 @@ compile:
     - rustup target add "${TARGET}"
     - RUSTFLAGS="$(../rustflags.sh)" cargo build -p libsignal-jni --target "${TARGET}" --release --verbose
     - cp -v target/${TARGET}/release/libsignal_jni.so ../libsignal_jni-${TARGET}.so
+  variables:
+    CC: clang-13
+    CXX: clang++-13
+    CPP: clang-cpp-13
+    AR: llvm-ar-13
+    STRIP: llvm-strip-13
+    RANLIB: llvm-ranlib-13
+    AS: llvm-as-13
+    OBJDUMP: llvm-objdump-13
+    OBJCOPY: llvm-objcopy-13
+    READELF: llvm-readelf-13
+    NM: llvm-nm-13
+    CC_LD: lld-13
+    CXX_LD: lld-13
+    LD: lld-13
+
   artifacts:
     paths:
       - libsignal_jni-$TARGET.so
diff --git a/prepare-env.sh b/prepare-env.sh
index 2422ed6..e56887b 100755
--- a/prepare-env.sh
+++ b/prepare-env.sh
@@ -6,21 +6,21 @@ apt-get update
 PACKAGES=("git" "clang" "libclang-dev" "cmake" "make")
 case "${TARGET}" in
     aarch64-unknown-linux-gnu|aarch64-unknown-linux-musl)
-        apt-get install -y "${PACKAGES[@]}" crossbuild-essential-arm64 # {cpp,g++,gcc}-aarch64-linux-gnu libc-dev-arm64-cross
+        apt-get install -yq "${PACKAGES[@]}" crossbuild-essential-arm64 # {cpp,g++,gcc}-aarch64-linux-gnu libc-dev-arm64-cross
     ;;
     arm-unknown-linux-gnueabi|arm-unknown-linux-musleabi)
-        apt-get install -y "${PACKAGES[@]}" {cpp,g++,gcc}-arm-linux-gnueabi linux-libc-dev-armel-cross
+        apt-get install -yq "${PACKAGES[@]}" {cpp,g++,gcc}-arm-linux-gnueabi linux-libc-dev-armel-cross
     ;;
     arm-unknown-linux-gnueabihf|arm-unknown-linux-musleabihf)
-        apt-get install -y "${PACKAGES[@]}" {cpp,g++,gcc}-arm-linux-gnueabihf linux-libc-dev-armhf-cross
+        apt-get install -yq "${PACKAGES[@]}" {cpp,g++,gcc}-arm-linux-gnueabihf linux-libc-dev-armhf-cross
     ;;
     armv7-unknown-linux-gnueabihf|armv7-unknown-linux-musleabihf)
-        apt-get install -y "${PACKAGES[@]}" {cpp,g++,gcc}-arm-linux-gnueabihf linux-libc-dev-armel-cross
+        apt-get install -yq "${PACKAGES[@]}" {cpp,g++,gcc}-arm-linux-gnueabihf linux-libc-dev-armel-cross
     ;;
     x86_64-unknown-linux-musl)
-        apt-get install -y "${PACKAGES[@]}" musl-tools
+        apt-get install -yq "${PACKAGES[@]}" musl-tools
     ;;
     *)
-        apt-get install -y "${PACKAGES[@]}"
+        apt-get install -yq "${PACKAGES[@]}"
     ;;
 esac