Skip to content

Commit

Permalink
fix vgo build (#2)
Browse files Browse the repository at this point in the history
* Update README.md

* fix vgo build

* update go.mod
  • Loading branch information
ZHAO Yijun authored Aug 15, 2018
1 parent 53e98cc commit f5f7ed3
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 8 deletions.
15 changes: 12 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
all:install

GOPATH:=$(CURDIR)/../../../../
export GOPATH
export PYTHONPATH=.

# FIXME: When this issue is done(https://github.com/golang/go/issues/23965#issuecomment-409232583)
# Determine the compiler and version
COMPILER_HELP := $(shell $(CC) --help | head -n 1)
ifneq (,$(findstring clang,$(COMPILER_HELP)))
COMPILER = clang
else ifneq (,$(findstring gcc,$(COMPILER_HELP)))
COMPILER = gcc
else
COMPILER = unknown
endif

test:
./misc/gobeansdb_server.sh start
go version
Expand All @@ -19,4 +28,4 @@ pytest:install
./tests/run_test.sh

install:
vgo install github.com/douban/gobeansproxy
CC=$(COMPILER) vgo install ./
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ A proxy for [Gobeansdb](https://github.com/douban/gobeansdb).

## Prepare

GoBeansDB use `vgo` manage dependencies, please install [vgo](https://godoc.org/golang.org/x/vgo) first.
GoBeansProxy use `vgo` manage dependencies, please install [vgo](https://godoc.org/golang.org/x/vgo) first.
Supported Go version: 1.10.1+

## Install

```
$ cd ${GOPATH}
$ git clone http://github.com/douban/gobeansproxy.git src/github.com/douban/gobeansproxy
$ cd src/github.com/douban/gobeansproxy
$ git clone http://github.com/douban/gobeansproxy.git
$ cd gobeansproxy
$ make
```

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/douban/gobeansproxy

require (
github.com/davecgh/go-spew v1.1.0 // indirect
github.com/douban/gobeansdb v0.0.0-20180809060252-7f57d32485c3
github.com/douban/gobeansdb v1.0.1
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/testify v1.2.2
gopkg.in/yaml.v2 v2.2.1
Expand Down

0 comments on commit f5f7ed3

Please sign in to comment.