Merge pull request #5260 from glevand/for-merge-build

build: Simplify host detection
2016-05-03 11:28:46 -07:00 · 2016-05-03 11:28:46 -07:00 · 1a0d1ab4ab
parent 5d8d684a91 4ecb560604
commit 1a0d1ab4ab
1 changed files with 1 additions and 3 deletions
--- a/4
+++ b/4
@ -11,9 +11,7 @@ GIT_SHA=`git rev-parse --short HEAD || echo "GitNotFound"`

 LINK_OPERATOR="="

-host_arch=$(GOARCH="" go env | egrep 'GOARCH=' | sed 's/^GOARCH="\(.*\)".*/\1/')
-
-if [ -z "${GOARCH}" ] || [ "${GOARCH}" = "${host_arch}" ]; then
+if [ -z "${GOARCH}" ] || [ "${GOARCH}" = "$(go env GOHOSTARCH)" ]; then
 	out="bin"
 else
 	out="bin/${GOARCH}"