Merge "Suppress the "go command not found" message"
This commit is contained in:
commit
7f95156110
6
Makefile
6
Makefile
@ -6,10 +6,10 @@ GIT_MODULE ?= opendev.org/airship/airshipctl/pkg/version
|
|||||||
GO_FLAGS := -ldflags '-extldflags "-static"' -tags=netgo -trimpath
|
GO_FLAGS := -ldflags '-extldflags "-static"' -tags=netgo -trimpath
|
||||||
GO_FLAGS += -ldflags "-X ${GIT_MODULE}.gitVersion=${GIT_VERSION}"
|
GO_FLAGS += -ldflags "-X ${GIT_MODULE}.gitVersion=${GIT_VERSION}"
|
||||||
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
|
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
|
||||||
ifeq (,$(shell go env GOBIN))
|
ifeq (,$(shell go env GOBIN 2> /dev/null))
|
||||||
GOBIN = $(shell go env GOPATH)/bin
|
GOBIN = $(shell go env GOPATH 2> /dev/null)/bin
|
||||||
else
|
else
|
||||||
GOBIN = $(shell go env GOBIN)
|
GOBIN = $(shell go env GOBIN 2> /dev/null)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BINDIR := bin
|
BINDIR := bin
|
||||||
|
Loading…
Reference in New Issue
Block a user