drop +stable, add gcc-multilib g++-multilib deps

This commit is contained in:
finn 2022-12-20 00:25:15 -08:00
parent 6d7ed7fbd3
commit a9cded08de
2 changed files with 3 additions and 3 deletions

View file

@ -39,9 +39,9 @@ compile:
script: script:
- 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 +stable 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 +stable 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
cache: cache:

View file

@ -3,7 +3,7 @@ set -exuo pipefail
apt-get update apt-get update
PACKAGES=("git" "clang-13" "libclang-dev" "lld-13" "cmake" "make") PACKAGES=("git" "clang-13" "libclang-dev" "lld-13" "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