Merge pull request #6059 from ipfs/fix/make-build

mk: fix make install by not setting GOBIN

coverage/Rules.mk

@@ -3,10 +3,11 @@ include mk/header.mk
 $(d)/coverage_deps: $$(DEPS_GO)
 	rm -rf $(@D)/unitcover && mkdir $(@D)/unitcover
 	rm -rf $(@D)/sharnesscover && mkdir $(@D)/sharnesscover
+
 ifneq ($(IPFS_SKIP_COVER_BINS),1)
-	go install github.com/Kubuxu/gocovmerge
-	go install golang.org/x/tools/cmd/cover
+$(d)/coverage_deps: test/bin/gocovmerge
 endif
+
 .PHONY: $(d)/coverage_deps
 
 # unit tests coverage

coverage/tools.go

@@ -1,8 +0,0 @@
-// +build tools
-
-package coverage
-
-import (
-	_ "github.com/Kubuxu/gocovmerge"
-	_ "golang.org/x/tools/cmd/cover"
-)

go.mod

@@ -108,7 +108,6 @@ require (
 	github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7
 	github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c
 	golang.org/x/sys v0.0.0-20190302025703-b6889370fb10
-	golang.org/x/tools v0.0.0-20180221164845-07fd8470d635
 	gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
 	gopkg.in/cheggaaa/pb.v1 v1.0.28
 	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect

mk/golang.mk

@@ -12,7 +12,6 @@ GOTFLAGS ?=
 
 # match Go's default GOPATH behaviour
 export GOPATH ?= $(shell $(GOCC) env GOPATH)
-export GOBIN = $(abspath bin)
 
 DEPS_GO :=
 TEST_GO :=

test/bin/Rules.mk

@@ -50,6 +50,10 @@ $(d)/random-files:
 	$(call go-build,github.com/jbenet/go-random-files/random-files)
 TGTS_$(d) += $(d)/random-files
 
+$(d)/gocovmerge:
+	$(call go-build,github.com/Kubuxu/gocovmerge)
+TGTS_$(d) += $(d)/gocovmerge
+
 
 $(TGTS_$(d)): $$(DEPS_GO)
 

test/dependencies/dependencies.go

@@ -3,6 +3,7 @@
 package tools
 
 import (
+	_ "github.com/Kubuxu/gocovmerge"
 	_ "github.com/ipfs/go-cidutil/cid-fmt"
 	_ "github.com/ipfs/hang-fds"
 	_ "github.com/jbenet/go-random-files/random-files"