From 248813a083f21e4670a7b9fd269c7b774209dbd9 Mon Sep 17 00:00:00 2001
From: Peter Rifel <pgrifel@gmail.com>
Date: Thu, 31 Oct 2019 10:13:27 -0700
Subject: [PATCH] Remove workarounds for older versions of go

---
 Makefile | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/Makefile b/Makefile
index 78964b047b..57c3eb6807 100644
--- a/Makefile
+++ b/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