opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-28 00:39:31 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4678 from ipfs/fix/gopath-default

Browse Source 
build: match Go's GOPATH defaults behaviour
This commit is contained in:
Whyrusleeping
2018-03-24 20:58:00 -07:00
committed by GitHub
parent 7d8424662a 67a6e63eb2
commit ed82e4e43f
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/check_go_path
View File

@ -7,11 +7,6 @@ if [ -z "$PWD" ]; then
exit 1 exit 1
fi fi
if [ -z "$GOPATH" ]; then
echo "GOPATH not set, you must have go configured properly to install ipfs"
exit 1
fi
while [ ${#} -gt 1 ]; do while [ ${#} -gt 1 ]; do
if [ "$PWD" = "$2" ]; then if [ "$PWD" = "$2" ]; then
exit 0 exit 0
@ -20,5 +15,5 @@ while [ ${#} -gt 1 ]; do
done done
echo "go-ipfs must be built from within your \$GOPATH directory." echo "go-ipfs must be built from within your \$GOPATH directory."
echo "expected within '$GOPATH' but got '$PWD'" echo "expected within '$(go env GOPATH)' but got '$PWD'"
exit 1 exit 1

4
mk/golang.mk
View File

@ -1,12 +1,16 @@
# golang utilities # golang utilities
GO_MIN_VERSION = 1.9 GO_MIN_VERSION = 1.9
# pre-definitions # pre-definitions
GOCC ?= go GOCC ?= go
GOTAGS ?= GOTAGS ?=
GOFLAGS ?= GOFLAGS ?=
GOTFLAGS ?= GOTFLAGS ?=
# match Go's default GOPATH behaviour
export GOPATH ?= $(shell $(GOCC) env GOPATH)
DEPS_GO := DEPS_GO :=
TEST_GO := TEST_GO :=
TEST_GO_BUILD := TEST_GO_BUILD :=