Skip to content

Add RUNTIME_TOOLS_LINK in Makefile #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vbatts merged 1 commit into from
Nov 3, 2016
Merged

Add RUNTIME_TOOLS_LINK in Makefile #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,6 @@ oci

*.1
*.patch

# Temporary symbol links
Godeps/_workspace/src/github.com/opencontainers/runtime-tools
7 changes: 6 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ PREFIX ?= $(DESTDIR)/usr
BINDIR ?= $(DESTDIR)/usr/bin

BUILDTAGS=
RUNTIME_TOOLS_LINK := $(CURDIR)/Godeps/_workspace/src/github.com/opencontainers/runtime-tools
Copy link
Contributor

@wking wking Oct 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this approach confuse godep save, godep update and such? Maybe it would be better to setup a second tree:

LOCAL_GOPATH := $(CURDIR)/_workspace
RUNTIME_TOOLS_LINK := $(LOCAL_GOPATH)/src/github.com/opencontainers/runtime-tools
export GOPATH:=$(LOCAL_GOPATH):$(CURDIR)/Godeps/_workspace:$(GOPATH)

export GOPATH:=$(CURDIR)/Godeps/_workspace:$(GOPATH)

all:
all: $(RUNTIME_TOOLS_LINK)
go build -tags "$(BUILDTAGS)" -o oci-runtime-tool ./cmd/oci-runtime-tool
go build -tags "$(BUILDTAGS)" -o runtimetest ./cmd/runtimetest

Expand All @@ -24,6 +25,10 @@ install: man

clean:
rm -f oci-runtime-tool runtimetest *.1
rm -f $(RUNTIME_TOOLS_LINK)

$(RUNTIME_TOOLS_LINK):
ln -sf $(CURDIR) $(RUNTIME_TOOLS_LINK)

.PHONY: test .gofmt .govet .golint

Expand Down