tweak cargo build invocation

This commit is contained in:
finn 2022-12-19 23:28:43 -08:00
parent 4a2ee2fd9c
commit a406790abf

View file

@ -5,6 +5,7 @@ stages:
variables: variables:
libsignal_version: "v0.21.1" libsignal_version: "v0.21.1"
GRADLE_OPTS: -Dorg.gradle.daemon=false GRADLE_OPTS: -Dorg.gradle.daemon=false
CARGO_TERM_COLOR: always
.multitarget: .multitarget:
parallel: parallel:
@ -40,24 +41,9 @@ compile:
- cd libsignal-client && git checkout "$libsignal_version" - cd libsignal-client && git checkout "$libsignal_version"
- 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 -p libsignal-jni --target "${TARGET}" --release --verbose - RUSTFLAGS="$(../rustflags.sh)" cargo build +stable --target "${TARGET}" --workspace --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: clang-13
# CXX: clang++-13
# CPP: clang-cpp-13
# AR: llvm-ar-13
# STRIP: llvm-strip-13
# RANLIB: llvm-ranlib-13
# AS: llvm-as-13
# OBJDUMP: llvm-objdump-13
# OBJCOPY: llvm-objcopy-13
# READELF: llvm-readelf-13
# NM: llvm-nm-13
# CC_LD: lld-13
# CXX_LD: lld-13
# LD: lld-13
cache: cache:
paths: paths:
- target/ - target/