signald/libsignal-client
1
0
Fork 0
mirror of https://gitlab.com/signald/libraries/libsignal-client.git synced 2024-12-04 11:36:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove -p from cargo

Browse source
This commit is contained in:
finn 2022-12-20 01:21:53 -08:00
parent b141118c6b
commit 4a254a1058
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.cargo/config Normal file
View file

@ -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"

2
.gitlab-ci.yml
View file

@ -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:

8
prepare-env.sh
View file

@ -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
;;