File tree 2 files changed +5
-6
lines changed 2 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -7,11 +7,6 @@ if [ -z "$PWD" ]; then
7
7
exit 1
8
8
fi
9
9
10
- if [ -z " $GOPATH " ]; then
11
- echo " GOPATH not set, you must have go configured properly to install ipfs"
12
- exit 1
13
- fi
14
-
15
10
while [ ${# } -gt 1 ]; do
16
11
if [ " $PWD " = " $2 " ]; then
17
12
exit 0
@@ -20,5 +15,5 @@ while [ ${#} -gt 1 ]; do
20
15
done
21
16
22
17
echo " go-ipfs must be built from within your \$ GOPATH directory."
23
- echo " expected within '$GOPATH ' but got '$PWD '"
18
+ echo " expected within '$( go env GOPATH) ' but got '$PWD '"
24
19
exit 1
Original file line number Diff line number Diff line change 1
1
# golang utilities
2
2
GO_MIN_VERSION = 1.9
3
3
4
+
4
5
# pre-definitions
5
6
GOCC ?= go
6
7
GOTAGS ?=
7
8
GOFLAGS ?=
8
9
GOTFLAGS ?=
9
10
11
+ # match Go's default GOPATH behaviour
12
+ export GOPATH ?= $(shell $(GOCC ) env GOPATH)
13
+
10
14
DEPS_GO :=
11
15
TEST_GO :=
12
16
TEST_GO_BUILD :=
You can’t perform that action at this time.
0 commit comments