Simplify GOPATH check
License: MIT Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
Jakub Sztandera committed
Mar 9, 2018 at 10:32 UTC
8c9725d88e5546a5de21ba4c7f230e10715bb07a
2 files changed
+3
-4
bin/check_go_path
-2
@@ -7,8 +7,6 @@ if [ -z "$PWD" ]; then
7
exit 1
8
fi
9
10
-[ -z "$GOPATH" ] && GOPATH="$HOME/go"
11
-
10
while [ ${#} -gt 1 ]; do
11
if [ "$PWD" = "$2" ]; then
12
exit 0
mk/golang.mk
+3
-2
@@ -1,8 +1,6 @@
1
# golang utilities
2
GO_MIN_VERSION = 1.9
3
4
-# match Go's default GOPATH behaviour
5
-GOPATH ?= $(HOME)/go
4
5
# pre-definitions
6
GOCC ?= go
@@ -10,6 +8,9 @@ GOTAGS ?=
8
GOFLAGS ?=
9
GOTFLAGS ?=
10
11
+# match Go's default GOPATH behaviour
12
+export GOPATH ?= $(shell $(GOCC) env GOPATH)
13
+
14
DEPS_GO :=
15
TEST_GO :=
16
TEST_GO_BUILD :=