From 43187a3bf54cdf32c392c011c8ae9375a84a83e0 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Fri, 6 Dec 2019 14:35:24 +0100 Subject: [PATCH] Only execute go build -i on darwin As some linux systems don't like the -i flag for go build we are generally disabling that by default, you can always enable it by overwriting GOBUILD. --- Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a1d0f2abfc..3c2e76f0cc 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,16 @@ DIST := dist ifeq ($(OS), Windows_NT) EXECUTABLE := $(NAME).exe + UNAME := Windows else EXECUTABLE := $(NAME) + UNAME := $(shell uname -s) +endif + +ifeq ($(UNAME), Darwin) + GOBUILD ?= go build -i +else + GOBUILD ?= go build endif PACKAGES ?= $(shell go list ./...) @@ -87,10 +95,10 @@ install: $(SOURCES) build: $(BIN)/$(EXECUTABLE) $(BIN)/$(EXECUTABLE)-debug $(BIN)/$(EXECUTABLE): $(SOURCES) - go build -i -v -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $@ ./cmd/$(NAME) + $(GOBUILD) -v -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $@ ./cmd/$(NAME) $(BIN)/$(EXECUTABLE)-debug: $(SOURCES) - go build -i -v -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -gcflags '$(GCFLAGS)' -o $@ ./cmd/$(NAME) + $(GOBUILD) -v -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -gcflags '$(GCFLAGS)' -o $@ ./cmd/$(NAME) .PHONY: release release: release-dirs release-linux release-windows release-darwin release-copy release-check