From ef97af68510bb28113ac6a1293c97b7a98372102 Mon Sep 17 00:00:00 2001 From: Leon Zhang Date: Fri, 26 Feb 2021 12:13:19 +0800 Subject: [PATCH] compatible with go 1.16 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index cb821b8..dcd1e6f 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ # BINARY=soar GOPATH ?= $(shell go env GOPATH) -GO111MODULE:=off +GO111MODULE:=auto export GO111MODULE # Ensure GOPATH is set before running build process. ifeq "$(GOPATH)" "" @@ -117,7 +117,7 @@ build: fmt @mkdir -p bin @ret=0 && for d in $$(go list -f '{{if (eq .Name "main")}}{{.ImportPath}}{{end}}' ./...); do \ b=$$(basename $${d}) ; \ - GO111MODULE=auto go build ${LDFLAGS} ${GCFLAGS} -o bin/$${b} $$d || ret=$$? ; \ + go build ${LDFLAGS} ${GCFLAGS} -o bin/$${b} $$d || ret=$$? ; \ done ; exit $$ret @echo "build Success!" @@ -182,7 +182,7 @@ release: build for d in $$(go list -f '{{if (eq .Name "main")}}{{.ImportPath}}{{end}}' ./...); do \ b=$$(basename $${d}) ; \ echo "Building $${b}.$${GOOS}-$${GOARCH} ..."; \ - GO111MODULE=auto CGO_ENABLED=0 GOOS=$${GOOS} GOARCH=$${GOARCH} go build ${GCFLAGS} ${LDFLAGS} -v -o release/$${b}.$${GOOS}-$${GOARCH} $$d 2>/dev/null ; \ + CGO_ENABLED=0 GOOS=$${GOOS} GOARCH=$${GOARCH} go build ${GCFLAGS} ${LDFLAGS} -v -o release/$${b}.$${GOOS}-$${GOARCH} $$d 2>/dev/null ; \ done ; \ done ;\ done -- GitLab