X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/e5b151a0fb66421cb02c683db4632399568745dc..816b381677e39d5f6a5b8e836293b83c4c1192d1:/packages/golang/build.sh

diff --git a/packages/golang/build.sh b/packages/golang/build.sh
index 2e7a3f50..0986ead5 100644
--- a/packages/golang/build.sh
+++ b/packages/golang/build.sh
@@ -1,11 +1,12 @@
 TERMUX_PKG_HOMEPAGE=https://golang.org/
 TERMUX_PKG_DESCRIPTION="Go programming language compiler"
-_MAJOR_VERSION=1.7
+local _MAJOR_VERSION=1.9.2
 # Use the ~ deb versioning construct in the future:
 TERMUX_PKG_VERSION=2:${_MAJOR_VERSION}
 TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz
-TERMUX_PKG_FOLDERNAME=go
+TERMUX_PKG_SHA256=665f184bf8ac89986cfd5a4460736976f60b57df6b320ad71ad4cef53bb143dc
 TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
+TERMUX_PKG_DEPENDS="clang"
 
 termux_step_make_install () {
 	termux_setup_golang
@@ -13,15 +14,15 @@ termux_step_make_install () {
 	TERMUX_GOLANG_DIRNAME=${GOOS}_$GOARCH
 	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}_shared}
+	mkdir -p $TERMUX_GODIR/{src,lib,pkg/tool/$TERMUX_GOLANG_DIRNAME,pkg/include,pkg/${TERMUX_GOLANG_DIRNAME}}
 
 	cd $TERMUX_PKG_SRCDIR/src
 	env CC_FOR_TARGET=$CC \
 	    CXX_FOR_TARGET=$CXX \
-	    CC=gcc \
+	    CC=clang \
 	    GO_LDFLAGS="-extldflags=-pie" \
 	    GOROOT_BOOTSTRAP=$GOROOT \
-            GOROOT_FINAL=$TERMUX_GODIR \
+	    GOROOT_FINAL=$TERMUX_GODIR \
 	    ./make.bash
 
 	cd ..
@@ -30,7 +31,8 @@ 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}_shared/* $TERMUX_GODIR/pkg/${TERMUX_GOLANG_DIRNAME}_shared/
+	cp -Rf lib/* $TERMUX_GODIR/lib
+	cp -Rf pkg/${TERMUX_GOLANG_DIRNAME}/* $TERMUX_GODIR/pkg/${TERMUX_GOLANG_DIRNAME}/
 }
 
 termux_step_post_massage () {