Skip to content

Commit

Permalink
remove RUNTIME_TOOLS_LINK
Browse files Browse the repository at this point in the history
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 <mashimiao.fnst@cn.fujitsu.com>
  • Loading branch information
Ma Shimiao committed Jul 4, 2017
1 parent b9e0ddc commit 662d87e
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -53,5 +48,5 @@ test: .gofmt .govet .golint
go vet -x ./...

.golint:
golint -set_exit_status ./...
golint ./...

0 comments on commit 662d87e

Please sign in to comment.