Skip to content

Commit

Permalink
Merge pull request #285 from jingyuanliang/gotc
Browse files Browse the repository at this point in the history 
Set GOTOOLCHAIN=local on the go command inside Makefile
  • Loading branch information
@google-oss-prow
google-oss-prow[bot] authored Mar 6, 2024
2 parents 04ea284 + 29346c2 commit c06c46e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ MAKEFLAGS += --warn-undefined-variables
.SUFFIXES:

# Used internally. Users should pass GOOS and/or GOARCH.
OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS))
ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
OS := $(if $(GOOS),$(GOOS),$(shell GOTOOLCHAIN=local go env GOOS))
ARCH := $(if $(GOARCH),$(GOARCH),$(shell GOTOOLCHAIN=local go env GOARCH))

TAG := $(VERSION)__$(OS)_$(ARCH)

Expand Down
4 changes: 2 additions & 2 deletions scripts/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ MAKEFLAGS += --warn-undefined-variables
.SUFFIXES:

# Used internally. Users should pass GOOS and/or GOARCH.
OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS))
ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
OS := $(if $(GOOS),$(GOOS),$(shell GOTOOLCHAIN=local go env GOOS))
ARCH := $(if $(GOARCH),$(GOARCH),$(shell GOTOOLCHAIN=local go env GOARCH))

TAG := $(VERSION)__$(OS)_$(ARCH)

Expand Down

0 comments on commit c06c46e

Please sign in to comment.