From 2e81a9a50c480634dc550134365bdefa888f800a Mon Sep 17 00:00:00 2001
From: Mike Splain <mike.splain@gmail.com>
Date: Tue, 3 Apr 2018 14:15:58 -0400
Subject: [PATCH] Fixes #4895

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4486224698..47f898e499 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ GO15VENDOREXPERIMENT=1
 export GO15VENDOREXPERIMENT
 
 COMPILERVERSION := $(shell go version | cut -d' ' -f3 | tr -d '\n')
-ifeq ($(COMPILERVERSION),go1.10)
+ifneq (,$(findstring go1.10,$(COMPILERVERSION)))
 LDFLAGS := -ldflags=all=
 else
 LDFLAGS := -ldflags=