mk: fix make install by not setting GOBIN
License: MIT Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
Jakub Sztandera committed
Mar 6, 2019 at 22:20 UTC
061128d1d376497855398e53af9e0f48601814de
6 files changed
+8
-12
coverage/Rules.mk
+3
-2
@@ -3,10 +3,11 @@ include mk/header.mk
3
$(d)/coverage_deps: $$(DEPS_GO)
4
rm -rf $(@D)/unitcover && mkdir $(@D)/unitcover
5
rm -rf $(@D)/sharnesscover && mkdir $(@D)/sharnesscover
6
+
7
ifneq ($(IPFS_SKIP_COVER_BINS),1)
7
- go install github.com/Kubuxu/gocovmerge
8
- go install golang.org/x/tools/cmd/cover
8
+$(d)/coverage_deps: test/bin/gocovmerge
9
endif
10
+
11
.PHONY: $(d)/coverage_deps
12
13
# unit tests coverage
coverage/tools.go
deleted
-8
@@ -1,8 +0,0 @@
1
-// +build tools
2
-
3
-package coverage
4
-
5
-import (
6
- _ "github.com/Kubuxu/gocovmerge"
7
- _ "golang.org/x/tools/cmd/cover"
8
-)
go.mod
-1
@@ -108,7 +108,6 @@ require (
108
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7
109
github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c
110
golang.org/x/sys v0.0.0-20190302025703-b6889370fb10
111
- golang.org/x/tools v0.0.0-20180221164845-07fd8470d635
111
gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
112
gopkg.in/cheggaaa/pb.v1 v1.0.28
113
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
mk/golang.mk
-1
@@ -12,7 +12,6 @@ GOTFLAGS ?=
12
13
# match Go's default GOPATH behaviour
14
export GOPATH ?= $(shell $(GOCC) env GOPATH)
15
-export GOBIN = $(abspath bin)
15
16
DEPS_GO :=
17
TEST_GO :=
test/bin/Rules.mk
+4
@@ -50,6 +50,10 @@ $(d)/random-files:
50
$(call go-build,github.com/jbenet/go-random-files/random-files)
51
TGTS_$(d) += $(d)/random-files
52
53
+$(d)/gocovmerge:
54
+ $(call go-build,github.com/Kubuxu/gocovmerge)
55
+TGTS_$(d) += $(d)/gocovmerge
56
+
57
58
$(TGTS_$(d)): $$(DEPS_GO)
59
test/dependencies/dependencies.go
+1
@@ -3,6 +3,7 @@
3
package tools
4
5
import (
6
+ _ "github.com/Kubuxu/gocovmerge"
7
_ "github.com/ipfs/go-cidutil/cid-fmt"
8
_ "github.com/ipfs/hang-fds"
9
_ "github.com/jbenet/go-random-files/random-files"