From d02411db3b9b86e9cd9268b9d95096deba5b32e2 Mon Sep 17 00:00:00 2001 From: Christoph Petrausch Date: Sat, 23 Jan 2021 22:10:47 +0100 Subject: [PATCH] Don't hardcode go binary path in makefile --- Makefile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 197f89e..e7b5fbf 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,9 @@ +ifndef GOBINARY + GOBINARY:="go" +endif + ifndef GOPATH - GOPATH:=$(shell go env GOPATH) + GOPATH:=$(shell $(GOBINARY) env GOPATH) endif ifndef GOBIN @@ -7,15 +11,15 @@ ifndef GOBIN endif ifndef GOARCH - GOARCH:=$(shell go env GOARCH) + GOARCH:=$(shell $(GOBINARY) env GOARCH) endif ifndef GOOS - GOOS:=$(shell go env GOOS) + GOOS:=$(shell $(GOBINARY) env GOOS) endif ifndef GOARM - GOARM:=$(shell go env GOARM) + GOARM:=$(shell $(GOBINARY) env GOARM) endif ifndef TARGET_FILE @@ -31,14 +35,14 @@ lint: golangci-lint run test: - go test ./... - go vet ./... + $(GOBINARY) test ./... + $(GOBINARY) vet ./... build: - GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(TARGET_FILE) ./cmd + GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBINARY) build -o $(TARGET_FILE) ./cmd static_build: - CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(TARGET_FILE) -a -tags netgo -ldflags '-w -extldflags "-static"' ./cmd + CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) $(GOBINARY) build -o $(TARGET_FILE) -a -tags netgo -ldflags '-w -extldflags "-static"' ./cmd container: docker build -t mqtt2prometheus:latest .