status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Detect correct GOOS/ARCH for copying binary with build_consul_local 

If GOOS/ARCH is set to something custom, we need to unset it before
testing the value so we can compare to the _original value_.
This commit is contained in:
Mitchell Hashimoto 2018-09-10 10:20:09 -07:00
parent 22500f242e
commit e7dfb8a0d2
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-support/functions/20-build.sh
View File

@ -460,7 +460,7 @@ function build_consul_local {
mkdir -p "${outdir}" mkdir -p "${outdir}"
GOBIN_EXTRA="" GOBIN_EXTRA=""
if test "${os}" != "$(go env GOOS)" -o "${arch}" != "$(go env GOARCH)" if test "${os}" != "$(go env GOHOSTOS)" -o "${arch}" != "$(go env GOHOSTARCH)"
then then
GOBIN_EXTRA="${os}_${arch}/" GOBIN_EXTRA="${os}_${arch}/"
fi fi