mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-12 10:33:52 +01:00
Merge pull request #4433 from stephan57160/master
Problem: Android build script may fail silently
This commit is contained in:
commit
875c2b15c3
@ -1,5 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
|
||||
function usage {
|
||||
echo "Usage ./build.sh [ arm | arm64 | x86 | x86_64 ]"
|
||||
}
|
||||
@ -86,7 +88,7 @@ LIBTOOL_EXTRA_LDFLAGS='-avoid-version'
|
||||
|
||||
(android_build_verify_so ${VERIFY} &> /dev/null) || {
|
||||
rm -rf "${cache}/libzmq"
|
||||
(cp -r ../.. "${cache}/libzmq" && cd "${cache}/libzmq" && make clean)
|
||||
(cp -r ../.. "${cache}/libzmq" && cd "${cache}/libzmq" && ( make clean || : ))
|
||||
|
||||
(cd "${cache}/libzmq" && ./autogen.sh \
|
||||
&& ./configure --quiet "${ANDROID_BUILD_OPTS[@]}" ${CURVE} --without-docs \
|
||||
|
@ -1,8 +1,15 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Exit if any step fails
|
||||
set -e
|
||||
|
||||
export NDK_VERSION=android-ndk-r25
|
||||
export ANDROID_NDK_ROOT="/tmp/${NDK_VERSION}"
|
||||
|
||||
# Cleanup.
|
||||
rm -rf /tmp/tmp-deps
|
||||
mkdir -p /tmp/tmp-deps
|
||||
|
||||
case $(uname | tr '[:upper:]' '[:lower:]') in
|
||||
linux*)
|
||||
HOST_PLATFORM=linux
|
||||
|
Loading…
Reference in New Issue
Block a user