X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/6f553afd6bfdd8c24d92dfb4bb3332a2ca5c6409..3a189d898c443782a48a6dd87bd0b58eaf9d1bf1:/packages/golang/build.sh

diff --git a/packages/golang/build.sh b/packages/golang/build.sh
index d63068cb..ad7d2621 100644
--- a/packages/golang/build.sh
+++ b/packages/golang/build.sh
@@ -1,32 +1,19 @@
 TERMUX_PKG_HOMEPAGE=https://golang.org/
 TERMUX_PKG_DESCRIPTION="Go programming language compiler"
-_MAJOR_VERSION=1.5
+_MAJOR_VERSION=1.6beta1
 # Need to be considered a higher version than "1.5rc1":
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.rel
+TERMUX_PKG_VERSION=1:$_MAJOR_VERSION
 TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz
 TERMUX_PKG_FOLDERNAME=go
 TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
 
-TERMUX_HOST_GOLANG_DIR=$TERMUX_PKG_CACHEDIR/go-host-$TERMUX_PKG_VERSION
-
-termux_step_post_extract_package () {
-	if [ ! -d $TERMUX_HOST_GOLANG_DIR ]; then
-		cd $TERMUX_PKG_CACHEDIR
-		curl -o go-host.tar.gz https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.linux-amd64.tar.gz
-		tar xf go-host.tar.gz
-		mv go $TERMUX_HOST_GOLANG_DIR
-	fi
-}
-
 termux_step_make_install () {
+	export GOOS=android
+	export CGO_ENABLED=1
 	if [ "$TERMUX_ARCH" = "arm" ]; then
-		export GOOS=android
-	    	export CGO_ENABLED=1
 		export GOARCH=arm
 		export GOARM=7
 	elif [ "$TERMUX_ARCH" = "i686" ]; then
-		export GOOS=linux
-	    	export CGO_ENABLED=0
 		export GOARCH=386
 		export GO386=sse2
 	else
@@ -38,14 +25,16 @@ termux_step_make_install () {
 
 	TERMUX_GODIR=$TERMUX_PREFIX/lib/go
 	rm -Rf $TERMUX_GODIR
-	mkdir -p $TERMUX_GODIR/{src,pkg/tool/$TERMUX_GOLANG_DIRNAME,pkg/include,pkg/$TERMUX_GOLANG_DIRNAME}
+	mkdir -p $TERMUX_GODIR/{src,pkg/tool/$TERMUX_GOLANG_DIRNAME,pkg/include,pkg/${TERMUX_GOLANG_DIRNAME}_shared}
+
+	termux_setup_golang
 
 	cd $TERMUX_PKG_SRCDIR/src
 	env CC_FOR_TARGET=$CC \
 	    CXX_FOR_TARGET=$CXX \
 	    CC=gcc \
 	    GO_LDFLAGS="-extldflags=-pie" \
-	    GOROOT_BOOTSTRAP=$TERMUX_HOST_GOLANG_DIR \
+	    GOROOT_BOOTSTRAP=$GOROOT \
             GOROOT_FINAL=$TERMUX_GODIR \
 	    ./make.bash
 
@@ -55,7 +44,7 @@ termux_step_make_install () {
 	cp pkg/tool/$TERMUX_GOLANG_DIRNAME/* $TERMUX_GODIR/pkg/tool/$TERMUX_GOLANG_DIRNAME/
 	cp -Rf src/* $TERMUX_GODIR/src/
 	cp pkg/include/* $TERMUX_GODIR/pkg/include/
-	cp -Rf pkg/$TERMUX_GOLANG_DIRNAME/* $TERMUX_GODIR/pkg/$TERMUX_GOLANG_DIRNAME/
+	cp -Rf pkg/${TERMUX_GOLANG_DIRNAME}_shared/* $TERMUX_GODIR/pkg/${TERMUX_GOLANG_DIRNAME}_shared/
 }
 
 termux_step_post_massage () {