Merge pull request #22840 from runcom/go1.6

Upgrade to golang 1.6.2
Upstream-commit: 9b0d385975c80359b4cab2c75e4834fe803e12d5
Component: engine

components/engine/hack/make.sh

@@ -117,7 +117,7 @@ if [ "$AUTO_GOPATH" ]; then
 	if [ "$(go env GOOS)" = 'solaris' ]; then
 		# sys/unix is installed outside the standard library on solaris
 		# TODO need to allow for version change, need to get version from go
-		export GOPATH="${GOPATH}:/usr/lib/gocode/1.5"
+		export GOPATH="${GOPATH}:/usr/lib/gocode/1.6.2"
 	fi
 fi
 

components/engine/hack/make/cross

@@ -27,13 +27,6 @@ for platform in $DOCKER_CROSSPLATFORMS; do
 		export GOOS=${platform%/*}
 		export GOARCH=${platform##*/}
 
-		# !!! TEMPORARY HACK !!!
-		# See Dockerfile
-		if [ "$platform" == "windows/amd64" ]; then
-			export GOROOT="/usr/local/go${HACK_GO_VERSION}"
-			export PATH=$(echo "$PATH" | sed "s,:/usr/local/go/bin:,:/usr/local/go${HACK_GO_VERSION}/bin:,")
-		fi
-
 		if [ -z "${daemonSupporting[$platform]}" ]; then
             # we just need a simple client for these platforms
 			export LDFLAGS_STATIC_DOCKER=""