1 files changed, 13 insertions, 13 deletions

diff --git a/meta/recipes-devtools/go/go-native.inc b/meta/recipes-devtools/go/go-native.inc
index 95db1c2b7c..35561768df 100644
--- a/meta/recipes-devtools/go/go-native.inc
+++ b/meta/recipes-devtools/go/go-native.inc
@@ -4,34 +4,34 @@ nonstaging_libdir := "${libdir}"
 
 inherit native
 
-SRC_URI_append = " http://golang.org/dl/go1.4.3.src.tar.gz;name=bootstrap;subdir=go1.4"
-SRC_URI[bootstrap.md5sum] = "dfb604511115dd402a77a553a5923a04"
-SRC_URI[bootstrap.sha256sum] = "9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959"
+SRC_URI_append = " https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz;name=bootstrap;subdir=go1.4"
+SRC_URI[bootstrap.md5sum] = "dbf727a4b0e365bf88d97cbfde590016"
+SRC_URI[bootstrap.sha256sum] = "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52"
 
 export GOOS = "${BUILD_GOOS}"
 export GOARCH = "${BUILD_GOARCH}"
+export GOTMPDIR ?= "${WORKDIR}/go-tmp"
+GOTMPDIR[vardepvalue] = ""
 CC = "${@d.getVar('BUILD_CC').strip()}"
 
 export CGO_ENABLED = "1"
+GOMAKEARGS ?= "--no-banner"
 
 do_configure() {
-    cd ${WORKDIR}/go1.4/go/src
-    CGO_ENABLED=0 GOROOT=${WORKDIR}/go1.4/go ./make.bash
+        cd ${WORKDIR}/go1.4/go/src
+        CGO_ENABLED=0 GOROOT=${WORKDIR}/go1.4/go ./make.bash
 }
 
 do_compile() {
-        export GOBIN="${B}/bin"
         export GOROOT_FINAL="${nonstaging_libdir}/go"
         export GOROOT_BOOTSTRAP="${WORKDIR}/go1.4/go"
-        rm -rf ${GOBIN}
-        mkdir ${GOBIN}
-
-        export TMPDIR=${WORKDIR}/build-tmp
-        mkdir -p ${WORKDIR}/build-tmp
 
         cd src
-        ./make.bash --host-only
+        ./make.bash ${GOMAKEARGS}
+        cd ${B}
 }
+do_compile[dirs] =+ "${GOTMPDIR} ${B}/bin"
+do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin"
 
 make_wrapper() {
         rm -f ${D}${bindir}/$2$3
@@ -51,7 +51,7 @@ do_install() {
         (cd ${S}/src; for d in *; do \
                 [ -d $d ] && cp -a ${S}/src/$d ${D}${libdir}/go/src/; \
         done)
-        rm -rf ${D}${libdir}/go/src/runtime/pprof/testdata
+        find ${D}${libdir}/go/src -depth -type d -name testdata -exec rm -rf {} \;
         install -d ${D}${bindir} ${D}${libdir}/go/bin
         for f in ${B}/bin/*
         do