drop aarch64-specific packages entirely

This commit is contained in:
finn 2022-12-20 00:32:45 -08:00
parent a9cded08de
commit 6a169f0486
2 changed files with 2 additions and 1 deletions

View file

@ -39,6 +39,7 @@ compile:
script:
- git clone https://github.com/signalapp/libsignal-client
- cd libsignal-client && git checkout "$libsignal_version"
- 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

View file

@ -6,7 +6,7 @@ apt-get update
PACKAGES=("git" "clang-13" "libclang-dev" "lld-13" "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
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