Skip to content

Commit a314eea

Browse files
committed
make setup-go.sh GOTOOLCHAIN aware
TODO: deal with gimme is broken
1 parent 075a52e commit a314eea

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

hack/build/setup-go.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,18 @@ export GIMME_ENV_PREFIX=./bin/.gimme/
2929
export GIMME_SILENT_ENV=y
3030

3131
# only setup go if we haven't set FORCE_HOST_GO, or `go version` doesn't match
32-
# go version output looks like:
33-
# go version go1.14.5 darwin/amd64
34-
if ! ([ -n "${FORCE_HOST_GO:-}" ] || \
35-
(command -v go >/dev/null && [ "$(go version | cut -d' ' -f3)" = "go${GO_VERSION}" ])); then
32+
if [ -n "${FORCE_HOST_GO:-}" ]; then
33+
GOTOOLCHAIN="${GOTOOLCHAIN:-local}"
34+
export GOTOOLCHAIN
35+
else
36+
GOTOOLCHAIN="go${GO_VERSION}"
37+
export GOTOOLCHAIN
38+
# go version output looks like:
39+
# go version go1.14.5 darwin/amd64
40+
if ! (command -v go >/dev/null && [ "$(go version | cut -d' ' -f3)" = "go${GO_VERSION}" ]); then
3641
# eval because the output of this is shell to set PATH etc.
3742
eval "$(hack/third_party/gimme/gimme "${GO_VERSION}")"
43+
fi
3844
fi
3945

4046
# force go modules

0 commit comments

Comments
 (0)