Skip to content

Commit

Permalink
Merge pull request etcd-io#5260 from glevand/for-merge-build
Browse files Browse the repository at this point in the history
build: Simplify host detection
  • Loading branch information
Anthony Romano committed May 3, 2016
2 parents 5d8d684 + 4ecb560 commit 1a0d1ab
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions build
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down

0 comments on commit 1a0d1ab

Please sign in to comment.