From 4a254a10583bac9064851185f70e0453be1f7123 Mon Sep 17 00:00:00 2001
From: finn <finn@janky.solutions>
Date: Tue, 20 Dec 2022 01:21:53 -0800
Subject: [PATCH] remove -p from cargo

---
 .cargo/config  | 13 +++++++++++++
 .gitlab-ci.yml |  2 +-
 prepare-env.sh |  8 ++++----
 3 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 .cargo/config

diff --git a/.cargo/config b/.cargo/config
new file mode 100644
index 0000000..df40aa0
--- /dev/null
+++ b/.cargo/config
@@ -0,0 +1,13 @@
+[build]
+
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
+
+[target.arm-unknown-linux-gnueabi]
+linker = "lld-13"
+
+[target.arm-unknown-linux-gnueabihf]
+linker = "lld-13"
+
+[target.armv7-unknown-linux-gnueabihf]
+linker = "lld-13"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57f8774..d489269 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ compile:
     - rustup set profile minimal
     - rustup target add "${TARGET}"
     - if [[ -d ../target ]]; then mv ../target target; fi
-    - RUSTFLAGS="$(../rustflags.sh)" cargo build -p libsignal-jni --target "${TARGET}" --release --verbose
+    - RUSTFLAGS="$(../rustflags.sh)" cargo build --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 ee7a6e8..cb4c7f9 100755
--- a/prepare-env.sh
+++ b/prepare-env.sh
@@ -3,11 +3,11 @@ set -exuo pipefail
 
 apt-get update
 
-PACKAGES=("git" "clang-13" "libclang-dev" "lld-13" "cmake" "make" "gcc-multilib" "g++-multilib")
+PACKAGES=("git" "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
     ;;