]> git.apps.os.sepia.ceph.com Git - fscrypt.git/commitdiff
Don't vendor helper tooling
authorJoe Richey joerichey@google.com <joerichey@google.com>
Thu, 30 Aug 2018 09:19:59 +0000 (02:19 -0700)
committerJoe Richey joerichey@google.com <joerichey@google.com>
Thu, 30 Aug 2018 09:19:59 +0000 (02:19 -0700)
Makefile

index 62f519f66a293408144e5df22a5e4237f7f16489..a1fa42ab6b0fc50773a09595945dd9c0f0152dc3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -166,18 +166,21 @@ TOOLS := $(addprefix $(BIN)/,protoc golint protoc-gen-go goimports megacheck goc
 .PHONY: tools
 tools: $(TOOLS)
 
-# Go tools build from vendored sources
-VENDOR := $(shell find vendor -type f)
-$(BIN)/golint: $(VENDOR)
-       go build -o $@ ./vendor/github.com/golang/lint/golint
-$(BIN)/protoc-gen-go: $(VENDOR)
-       go build -o $@ ./vendor/github.com/golang/protobuf/protoc-gen-go
-$(BIN)/goimports: $(VENDOR)
-       go build -o $@ ./vendor/golang.org/x/tools/cmd/goimports
-$(BIN)/megacheck: $(VENDOR)
-       go build -o $@ ./vendor/honnef.co/go/tools/cmd/megacheck
-$(BIN)/gocovmerge: $(VENDOR)
-       go build -o $@ ./vendor/github.com/wadey/gocovmerge
+$(BIN)/golint:
+       GO111MODULE=off go get github.com/golang/lint/golint
+       GO111MODULE=off go build -o $@ github.com/golang/lint/golint
+$(BIN)/protoc-gen-go:
+       GO111MODULE=off go get github.com/golang/protobuf/protoc-gen-go
+       GO111MODULE=off go build -o $@ github.com/golang/protobuf/protoc-gen-go
+$(BIN)/goimports:
+       GO111MODULE=off go get golang.org/x/tools/cmd/goimports
+       GO111MODULE=off go build -o $@ golang.org/x/tools/cmd/goimports
+$(BIN)/megacheck:
+       GO111MODULE=off go get honnef.co/go/tools/cmd/megacheck
+       GO111MODULE=off go build -o $@ honnef.co/go/tools/cmd/megacheck
+$(BIN)/gocovmerge:
+       GO111MODULE=off go get github.com/wadey/gocovmerge
+       GO111MODULE=off go build -o $@ github.com/wadey/gocovmerge
 
 # Non-go tools downloaded from appropriate repository
 PROTOC_VERSION := 3.5.1