Commit cec73bfa authored by Marek Vavruša's avatar Marek Vavruša

build: allow Go 1.5 (without .0)

parent 62001974
......@@ -29,8 +29,8 @@ $(eval $(call find_lib,libdnssec))
$(eval $(call find_gopkg,geoip,github.com/abh/geoip))
# Find Go compiler version
E :=
GO_VERSION := $(subst $(E) $(E),,$(subst go,,$(wordlist 1,3,$(subst ., ,$(word 3,$(shell $(GO) version))))))
$(eval $(call find_ver,go,$(GO_VERSION),150))
GO_VERSION := $(subst $(E) $(E),,$(subst go,,$(wordlist 1,2,$(subst ., ,$(word 3,$(shell $(GO) version))))))
$(eval $(call find_ver,go,$(GO_VERSION),15))
# Work around luajit on OS X
ifeq ($(PLATFORM), Darwin)
......
......@@ -120,7 +120,7 @@ endef
# Find version
define find_ver
ifeq ($(shell test $(2) -gt $(3); echo $$?),0)
ifeq ($(shell test $(2) -ge $(3); echo $$?),0)
HAS_$(1) := yes
else
HAS_$(1) := no
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment