Code Review
/
src
/
xds
/
xds-agent.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
a64aa61
)
Fix glide path for non Linux OSes
author
Sebastien Douheret
<sebastien.douheret@iot.bzh>
Fri, 23 Jun 2017 16:12:29 +0000
(18:12 +0200)
committer
Sebastien Douheret
<sebastien.douheret@iot.bzh>
Fri, 23 Jun 2017 16:12:29 +0000
(18:12 +0200)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
1d1e07d
..
ad017eb
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-93,13
+93,13
@@
package-all:
GOOS=darwin GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
test: tools/glide
GOOS=darwin GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
test: tools/glide
- go test --race $(shell
./tools/linux
/glide novendor)
+ go test --race $(shell
$(LOCAL_TOOLSDIR)
/glide novendor)
vet: tools/glide
vet: tools/glide
- go vet $(shell
./tools/linux
/glide novendor)
+ go vet $(shell
$(LOCAL_TOOLSDIR)
/glide novendor)
fmt: tools/glide
fmt: tools/glide
- go fmt $(shell
./tools/linux
/glide novendor)
+ go fmt $(shell
$(LOCAL_TOOLSDIR)
/glide novendor)
run: build/xds tools/syncthing/copytobin
$(LOCAL_BINDIR)/xds-agent$(EXT) --log info -c agent-config.json.in
run: build/xds tools/syncthing/copytobin
$(LOCAL_BINDIR)/xds-agent$(EXT) --log info -c agent-config.json.in
@@
-120,7
+120,7
@@
install: all
mkdir -p $(DESTDIR) && cp $(LOCAL_BINDIR)/* $(DESTDIR)
vendor: tools/glide glide.yaml
mkdir -p $(DESTDIR) && cp $(LOCAL_BINDIR)/* $(DESTDIR)
vendor: tools/glide glide.yaml
-
./tools/linux
/glide install --strip-vendor
+
$(LOCAL_TOOLSDIR)
/glide install --strip-vendor
.PHONY: tools/glide
tools/glide:
.PHONY: tools/glide
tools/glide: