fix toolchain path

This commit is contained in:
yourok
2019-10-30 20:08:40 +03:00
parent 540b6d9978
commit 3285e91007

View File

@@ -36,7 +36,7 @@
# from the standard ports/downloads and therefore removed from this list. # from the standard ports/downloads and therefore removed from this list.
# #
PLATFORMS="" PLATFORMS=""
PLATFORMS="$PLATFORMS darwin/amd64" # amd64 only as of go1.5 PLATFORMS="$PLATFORMS darwin/amd64" # amd64 only as of go1.5
PLATFORMS="$PLATFORMS windows/amd64 windows/386" # arm compilation not available for Windows PLATFORMS="$PLATFORMS windows/amd64 windows/386" # arm compilation not available for Windows
PLATFORMS="$PLATFORMS linux/amd64 linux/386" PLATFORMS="$PLATFORMS linux/amd64 linux/386"
# PLATFORMS="$PLATFORMS linux/ppc64 linux/ppc64le" # PLATFORMS="$PLATFORMS linux/ppc64 linux/ppc64le"
@@ -74,7 +74,7 @@ type setopt >/dev/null 2>&1
export GOPATH="${PWD}" export GOPATH="${PWD}"
SCRIPT_NAME=`basename "$0"` SCRIPT_NAME=$(basename "$0")
FAILURES="" FAILURES=""
SOURCE_FILE="dist/TorrServer" SOURCE_FILE="dist/TorrServer"
CURRENT_DIRECTORY=${PWD##*/} CURRENT_DIRECTORY=${PWD##*/}
@@ -102,7 +102,7 @@ for GOOS in $PLATFORMS_ARM; do
# build for each ARM version # build for each ARM version
for GOARM in 7 6 5; do for GOARM in 7 6 5; do
BIN_FILENAME="${OUTPUT}-${GOOS}-${GOARCH}${GOARM}" BIN_FILENAME="${OUTPUT}-${GOOS}-${GOARCH}${GOARM}"
CMD="GOARM=${GOARM} GOOS=${GOOS} GOARCH=${GOARCH} go build -o ${BIN_FILENAME} main" CMD="GOARM=${GOARM} GOOS=${GOOS} GOARCH=${GOARCH} go build -o ${BIN_FILENAME} main"
echo "${CMD}" echo "${CMD}"
eval "${CMD}" || FAILURES="${FAILURES} ${GOOS}/${GOARCH}${GOARM}" eval "${CMD}" || FAILURES="${FAILURES} ${GOOS}/${GOARCH}${GOARM}"
done done
@@ -119,7 +119,7 @@ export CGO_ENABLED=1
export GOOS=android export GOOS=android
export LDFLAGS="-s -w" export LDFLAGS="-s -w"
export NDK_TOOLCHAIN=/space/Projects/GO/TorrServer/toolchains export NDK_TOOLCHAIN=$GOPATH/toolchains
export CC=$NDK_TOOLCHAIN/bin/armv7a-linux-androideabi21-clang export CC=$NDK_TOOLCHAIN/bin/armv7a-linux-androideabi21-clang
export CXX=$NDK_TOOLCHAIN/bin/armv7a-linux-androideabi21-clang++ export CXX=$NDK_TOOLCHAIN/bin/armv7a-linux-androideabi21-clang++
export GOARCH=arm export GOARCH=arm