From bf10b1b72e2621f10483d0ce5b1947d55f8648cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= Date: Wed, 21 Aug 2019 22:05:50 +0200 Subject: [PATCH] move Go-related stuff to nim-beacon-chain --- makefiles/targets.mk | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/makefiles/targets.mk b/makefiles/targets.mk index 2072ffd..c6a0c17 100644 --- a/makefiles/targets.mk +++ b/makefiles/targets.mk @@ -5,7 +5,7 @@ # at your option. This file may not be copied, modified, or distributed except # according to those terms. -.PHONY: deps-common sanity-checks nat-libs libminiupnpc.a libnatpmp.a clean-common mrproper github-ssh build-nim update-common update-remote status go-checks ntags ctags fetch-dlls +.PHONY: deps-common sanity-checks nat-libs libminiupnpc.a libnatpmp.a clean-common mrproper github-ssh build-nim update-common update-remote status ntags ctags fetch-dlls #- when the special ".SILENT" target is present, all recipes are silenced as if they all had a "@" prefix #- by setting SILENT_TARGET_PREFIX to a non-empty value, the name of this target becomes meaningless to `make` @@ -102,22 +102,6 @@ status: | $(REPOS) $(eval CMD := $(GIT_STATUS)) $(RUN_CMD_IN_ALL_REPOS) -MIN_GO_VER := 1.12 -DISABLE_GO_CHECKS := 0 -go-checks: -ifeq ($(DISABLE_GO_CHECKS), 0) - which go &>/dev/null || { echo "Go compiler not installed. Aborting."; exit 1; } - GO_VER="$$(go version | sed -E 's/^.*go([0-9.]+).*$$/\1/')"; \ - [[ $$(echo -e "$${GO_VER}\n$(MIN_GO_VER)" | sort -t '.' -k 1,1 -k 2,2 -g | head -n 1) == "$(MIN_GO_VER)" ]] || \ - { echo "Minimum Go compiler version required: $(MIN_GO_VER). Version available: $$GO_VER. Aborting."; exit 1; } -endif - -vendor/go/bin/p2pd: | go-checks - echo -e $(BUILD_MSG) "$@" && \ - cd vendor/go/src/github.com/libp2p/go-libp2p-daemon && \ - $(ENV_SCRIPT) go get ./... $(HANDLE_OUTPUT) && \ - $(ENV_SCRIPT) go install ./... $(HANDLE_OUTPUT) - # https://bitbucket.org/nimcontrib/ntags/ - currently fails with "out of memory" ntags: ntags -R .