From f5da86c7b73f010eafbc5969d6b93c915ddb7917 Mon Sep 17 00:00:00 2001 From: kolsys Date: Sun, 12 Sep 2021 12:04:27 +0300 Subject: [PATCH] Old bash version compatible Disable Android build if NDK not available --- build-all.sh | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/build-all.sh b/build-all.sh index cdbf18d..bae13b4 100755 --- a/build-all.sh +++ b/build-all.sh @@ -83,20 +83,27 @@ done ### Android build section ##### -declare -A COMPILERS=( - ["arm7"]="armv7a-linux-androideabi21-clang" - ["arm64"]="aarch64-linux-android21-clang" - ["386"]="i686-linux-android21-clang" - ["amd64"]="x86_64-linux-android21-clang" +if [ -z "$NDK_TOOLCHAIN" ]; then + echo "NDK_TOOLCHAIN is not defined. Android builds was skipped" + exit +fi + +declare -a COMPILERS=( + "arm7:armv7a-linux-androideabi21-clang" + "arm64:aarch64-linux-android21-clang" + "386:i686-linux-android21-clang" + "amd64:x86_64-linux-android21-clang" ) export NDK_TOOLCHAIN=$ROOT/toolchain GOOS=android -for GOARCH in "${!COMPILERS[@]}"; do - export CC="$NDK_TOOLCHAIN/bin/${COMPILERS[$GOARCH]}" - export CXX="$NDK_TOOLCHAIN/bin/${COMPILERS[$GOARCH]}++" +for V in "${COMPILERS[@]}"; do + GOARCH=${V%:*} + COMPILER=${V#*:} + export CC="$NDK_TOOLCHAIN/bin/$COMPILER" + export CXX="$NDK_TOOLCHAIN/bin/$COMPILER++" set_goarm "$GOARCH" BIN_FILENAME="${OUTPUT}-${GOOS}-${GOARCH}${GOARM}" CMD="GOOS=${GOOS} GOARCH=${GOARCH} ${GO_ARM} CGO_ENABLED=1 ${GOBIN} build ${BUILD_FLAGS} -o ${BIN_FILENAME} ./cmd"