diff --git a/build b/build
index ef9cd95e2..407645415 100755
--- a/build
+++ b/build
@@ -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}"