X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/23d4b8b520f690f1d7ce473c861ea4cc73639646..80eb67dd0a2858dc3e0b41ae4e926589b69c639a:/packages/golang/build.sh diff --git a/packages/golang/build.sh b/packages/golang/build.sh index 93be1ed4..f689f932 100644 --- a/packages/golang/build.sh +++ b/packages/golang/build.sh @@ -1,10 +1,10 @@ TERMUX_PKG_HOMEPAGE=https://golang.org/ TERMUX_PKG_DESCRIPTION="Go programming language compiler" -_MAJOR_VERSION=1.7.3 +_MAJOR_VERSION=1.8.3 # 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_SHA256=2b843f133b81b7995f26d0cb64bbdbb9d0704b90c44df45f844d28881ad442d3 +TERMUX_PKG_SHA256=5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 TERMUX_PKG_FOLDERNAME=go TERMUX_PKG_KEEP_STATIC_LIBRARIES=true TERMUX_PKG_DEPENDS="clang" @@ -15,12 +15,12 @@ termux_step_make_install () { TERMUX_GOLANG_DIRNAME=${GOOS}_$GOARCH TERMUX_GODIR=$TERMUX_PREFIX/lib/go rm -Rf $TERMUX_GODIR - mkdir -p $TERMUX_GODIR/{src,lib,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 \ @@ -33,7 +33,7 @@ termux_step_make_install () { cp -Rf src/* $TERMUX_GODIR/src/ cp pkg/include/* $TERMUX_GODIR/pkg/include/ cp -Rf lib/* $TERMUX_GODIR/lib - cp -Rf pkg/${TERMUX_GOLANG_DIRNAME}_shared/* $TERMUX_GODIR/pkg/${TERMUX_GOLANG_DIRNAME}_shared/ + cp -Rf pkg/${TERMUX_GOLANG_DIRNAME}/* $TERMUX_GODIR/pkg/${TERMUX_GOLANG_DIRNAME}/ } termux_step_post_massage () {