@cryptotaxi247 / kubo / commits / 3e199ab3f

mk: s/go-build/go-build-relative/

License: MIT Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>

Jakub Sztandera committed Mar 3, 2019 at 19:48 UTC 3e199ab3f79a6c038310af60dfb7657531229174
4 files changed +9 -9
cmd/ipfs/Rules.mk
+1 -1
@@ -19,7 +19,7 @@ $(d)-try-build $(IPFS_BIN_$(d)): GOFLAGS += $(cmd/ipfs_flags)
19
20 # uses second expansion to collect all $(DEPS_GO)
21 $(IPFS_BIN_$(d)): $(d) $$(DEPS_GO) ALWAYS #| $(DEPS_OO_$(d))
22 - $(go-build)
22 + $(go-build-relative)
23
24 TRY_BUILD_$(d)=$(addprefix $(d)-try-build-,$(SUPPORTED_PLATFORMS))
25 $(d)-try-build: $(TRY_BUILD_$(d))
coverage/Rules.mk
+1 -1
@@ -32,7 +32,7 @@ TGTS_$(d) := $(d)/unit_tests.coverprofile
32 # sharness tests coverage
33 $(d)/ipfs: GOTAGS += testrunmain
34 $(d)/ipfs: $(d)/main
35 - $(go-build)
35 + $(go-build-relative)
36
37 CLEAN += $(d)/ipfs
38
mk/golang.mk
+1 -1
@@ -26,7 +26,7 @@ go-pkgs=$(shell $(GOCC) list github.com/ipfs/go-ipfs/...)
26 go-tags=$(if $(GOTAGS), -tags="$(call join-with,$(space),$(GOTAGS))")
27 go-flags-with-tags=$(GOFLAGS)$(go-tags)
28
29 -define go-build
29 +define go-build-relative
30 $(GOCC) build $(go-flags-with-tags) -o "$@" "$(call go-pkg-name,$<)"
31 endef
32
test/bin/Rules.mk
+6 -6
@@ -3,27 +3,27 @@ include mk/header.mk
3 TGTS_$(d) :=
4
5 $(d)/pollEndpoint: thirdparty/pollEndpoint
6 - $(go-build)
6 + $(go-build-relative)
7 TGTS_$(d) += $(d)/pollEndpoint
8
9 $(d)/go-sleep: test/dependencies/go-sleep
10 - $(go-build)
10 + $(go-build-relative)
11 TGTS_$(d) += $(d)/go-sleep
12
13 $(d)/go-timeout: test/dependencies/go-timeout
14 - $(go-build)
14 + $(go-build-relative)
15 TGTS_$(d) += $(d)/go-timeout
16
17 $(d)/iptb: test/dependencies/iptb
18 - $(go-build)
18 + $(go-build-relative)
19 TGTS_$(d) += $(d)/iptb
20
21 $(d)/ma-pipe-unidir: test/dependencies/ma-pipe-unidir
22 - $(go-build)
22 + $(go-build-relative)
23 TGTS_$(d) += $(d)/ma-pipe-unidir
24
25 $(d)/json-to-junit: test/dependencies/json-to-junit
26 - $(go-build)
26 + $(go-build-relative)
27 TGTS_$(d) += $(d)/json-to-junit
28
29 TGTS_GX_$(d) := hang-fds