maybe just needs this?

This commit is contained in:
finn 2022-12-20 01:44:56 -08:00
parent 62b9c0c752
commit 3363fbcfcb
2 changed files with 9 additions and 5 deletions

View file

@ -40,12 +40,16 @@ compile:
- git clone https://github.com/signalapp/libsignal-client - git clone https://github.com/signalapp/libsignal-client
- cd libsignal-client && git checkout "$libsignal_version" - cd libsignal-client && git checkout "$libsignal_version"
- rustup set profile minimal - rustup set profile minimal
- rustup toolchain install nightly
- rustup target add "${TARGET}" - rustup target add "${TARGET}"
- if [[ -d ../target ]]; then mv ../target target; fi - if [[ -d ../target ]]; then mv ../target target; fi
- RUSTFLAGS="$(../rustflags.sh)" cargo build --target "${TARGET}" --release --verbose - RUSTFLAGS="$(../rustflags.sh)" CARGO_BUILD_TARGET=${TARGET} cargo build -p libsignal-jni --target "${TARGET}" --release --verbose
- RUSTFLAGS="$(../rustflags.sh)" cargo build -p libsignal-jni --target "${TARGET}" --release --verbose
- cp -v target/${TARGET}/release/libsignal_jni.so ../libsignal_jni-${TARGET}.so - cp -v target/${TARGET}/release/libsignal_jni.so ../libsignal_jni-${TARGET}.so
- cp target/ ../target - cp target/ ../target
variables:
CC: aarch64-linux-gnu-gcc
CXX: aarch64-linux-gnu-g++
CPATH: /usr/aarch64-linux-gnu/include
cache: cache:
paths: paths:
- target/ - target/

View file

@ -5,9 +5,9 @@ apt-get update
PACKAGES=("git" "clang-13" "libclang-dev" "cmake" "make" "gcc-multilib" "g++-multilib") PACKAGES=("git" "clang-13" "libclang-dev" "cmake" "make" "gcc-multilib" "g++-multilib")
case "${TARGET}" in case "${TARGET}" in
# aarch64-unknown-linux-gnu|aarch64-unknown-linux-musl) 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 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) arm-unknown-linux-gnueabi|arm-unknown-linux-musleabi)
apt-get install -yqq "${PACKAGES[@]}" {cpp,g++,gcc}-arm-linux-gnueabi linux-libc-dev-armel-cross apt-get install -yqq "${PACKAGES[@]}" {cpp,g++,gcc}-arm-linux-gnueabi linux-libc-dev-armel-cross
;; ;;