From 662d87ee7409a7b89208e1b160153a6c2f719c50 Mon Sep 17 00:00:00 2001 From: Ma Shimiao Date: Mon, 14 Nov 2016 14:16:46 +0800 Subject: [PATCH] remove RUNTIME_TOOLS_LINK As _workspace is deprecated and support for it will be removed when go1.8 is released. I think RUNTIME_TOOLS_LINK will not be needed any more Signed-off-by: Ma Shimiao --- Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 98643a324..3a1f981fb 100644 --- a/Makefile +++ b/Makefile @@ -6,9 +6,8 @@ BINDIR ?= $(DESTDIR)/usr/bin BUILDTAGS= RUNTIME ?= runc -RUNTIME_TOOLS_LINK := $(CURDIR)/Godeps/_workspace/src/github.com/opencontainers/runtime-tools -all: $(RUNTIME_TOOLS_LINK) +all: go build -tags "$(BUILDTAGS)" -o oci-runtime-tool ./cmd/oci-runtime-tool go build -tags "$(BUILDTAGS)" -o runtimetest ./cmd/runtimetest @@ -33,10 +32,6 @@ uninstall: clean: rm -f oci-runtime-tool runtimetest *.1 - rm -f $(RUNTIME_TOOLS_LINK) - -$(RUNTIME_TOOLS_LINK): - ln -sf $(CURDIR) $(RUNTIME_TOOLS_LINK) localvalidation: RUNTIME=$(RUNTIME) go test -tags "$(BUILDTAGS)" ${TESTFLAGS} -v github.com/opencontainers/runtime-tools/validation @@ -53,5 +48,5 @@ test: .gofmt .govet .golint go vet -x ./... .golint: - golint -set_exit_status ./... + golint ./...