Skip to content

Commit bc55782

Browse files
committed
hack/make/go: update go.mk
1 parent f06b913 commit bc55782

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

hack/make/go.mk

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,15 @@ pkg/install:
6161
## test, bench and coverage
6262

6363
.PHONY: test
64-
test: GO_LDFLAGS=${GO_LDFLAGS_STATIC}
64+
test: GO_LDFLAGS=
6565
test: GO_BUILDTAGS+=${GO_BUILDTAGS_STATIC}
66-
test: GO_FLAGS+=-installsuffix ${GO_INSTALLSUFFIX_STATIC}
6766
test: ## Runs package test including race condition.
6867
$(call target)
6968
@GO111MODULE=on $(GO_TEST) -v -race -count 1 $(strip $(GO_FLAGS)) -run=$(GO_TEST_FUNC) $(GO_TEST_PKGS)
7069

7170
.PHONY: bench
72-
bench: GO_LDFLAGS=${GO_LDFLAGS_STATIC}
71+
bench: GO_LDFLAGS=
7372
bench: GO_BUILDTAGS+=${GO_BUILDTAGS_STATIC}
74-
bench: GO_FLAGS+=-installsuffix ${GO_INSTALLSUFFIX_STATIC}
7573
bench: ## Take a package benchmark.
7674
$(call target)
7775
@GO111MODULE=on $(GO_TEST) -v $(strip $(GO_FLAGS)) -run='^$$' -bench=$(GO_BENCH_FUNC) -benchmem $(GO_TEST_PKGS)
@@ -174,12 +172,12 @@ mod/install/static: ## Install the module vendor package as an object file with
174172

175173
.PHONY: mod/update
176174
mod/update: mod/goget mod/tidy mod/vendor mod/install ## Updates all of vendor packages.
177-
@GO111MODULE=on go mod edit -go 1.12
175+
@GO111MODULE=on go mod edit -go 1.13
178176

179177
.PHONY: mod
180178
mod: mod/init mod/tidy mod/vendor mod/install
181179
mod: ## Updates the vendoring directory using go mod.
182-
@GO111MODULE=on go mod edit -go 1.12
180+
@GO111MODULE=on go mod edit -go 1.13
183181

184182

185183
## clean

0 commit comments

Comments
 (0)