Skip to content

Commit 5a7b1af

Browse files
committed
Cleanup Makefile
1 parent f76b8cc commit 5a7b1af

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

Makefile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Go parameters
2-
GOENV ?= GO15VENDOREXPERIMENT=1
2+
GOENV ?=
33
GO ?= $(GOENV) go
44
GODEP ?= $(GOENV) godep
55
GOBUILD ?= $(GO) build
@@ -41,13 +41,6 @@ REV = $(shell git rev-parse --short HEAD 2>/dev/null || echo "nogit")
4141
LDFLAGS = "-X `go list ./pkg/scwversion`.GITCOMMIT=$(REV) -s"
4242
BUILDER = scaleway-cli-builder
4343

44-
# Check go version
45-
GOVERSIONMAJOR = $(shell go version | grep -o '[1-9].[0-9]' | cut -d '.' -f1)
46-
GOVERSIONMINOR = $(shell go version | grep -o '[1-9].[0-9]' | cut -d '.' -f2)
47-
VERSION_GE_1_5 = $(shell [ $(GOVERSIONMAJOR) -gt 1 -o $(GOVERSIONMINOR) -ge 5 ] && echo true)
48-
ifneq ($(VERSION_GE_1_5),true)
49-
$(error Bad go version, please install a version greater than or equal to 1.5)
50-
endif
5144

5245
BUILD_LIST = $(foreach int, $(COMMANDS), $(int)_build)
5346
CLEAN_LIST = $(foreach int, $(COMMANDS) $(PACKAGES), $(int)_clean)

0 commit comments

Comments
 (0)