mirror of https://github.com/kubernetes/kops.git
Remove workarounds for older versions of go
This commit is contained in:
parent
69fe8e3689
commit
248813a083
13
Makefile
13
Makefile
|
|
@ -98,20 +98,7 @@ PROTOKUBE_TAG := $(subst +,-,${VERSION})
|
|||
KOPS_SERVER_TAG := $(subst +,-,${VERSION})
|
||||
|
||||
# Go exports:
|
||||
|
||||
GO15VENDOREXPERIMENT=1
|
||||
export GO15VENDOREXPERIMENT
|
||||
|
||||
COMPILERVERSION := $(shell go version | cut -d' ' -f3 | sed 's/go//g' | tr -d '\n')
|
||||
COMPILER_VER_MAJOR := $(shell echo $(COMPILERVERSION) | cut -f1 -d.)
|
||||
COMPILER_VER_MINOR := $(shell echo $(COMPILERVERSION) | cut -f2 -d.)
|
||||
COMPILER_GT_1_10 := $(shell [ $(COMPILER_VER_MAJOR) -gt 1 -o \( $(COMPILER_VER_MAJOR) -eq 1 -a $(COMPILER_VER_MINOR) -ge 10 \) ] && echo true)
|
||||
|
||||
ifeq ($(COMPILER_GT_1_10), true)
|
||||
LDFLAGS := -ldflags=all=
|
||||
else
|
||||
LDFLAGS := -ldflags=
|
||||
endif
|
||||
|
||||
ifdef STATIC_BUILD
|
||||
CGO_ENABLED=0
|
||||
|
|
|
|||
Loading…
Reference in New Issue