Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
dms3
go-dms3
Commits
aac4088c
Commit
aac4088c
authored
Mar 30, 2017
by
Jeromy Johnson
Committed by
GitHub
Mar 30, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3838 from ipfs/fix/make/install-hash
make: fix `make install` not using ldflags for git hash
parents
c441ecbc
bf23a81b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
Rules.mk
Rules.mk
+1
-2
cmd/ipfs/Rules.mk
cmd/ipfs/Rules.mk
+9
-1
No files found.
Rules.mk
View file @
aac4088c
...
...
@@ -99,8 +99,7 @@ nofuse: GOTAGS += nofuse
nofuse
:
build
.PHONY
:
nofuse
install
:
$$(DEPS_GO)
go
install
$
(
go-flags-with-tags
)
./cmd/ipfs
install
:
cmd/ipfs-install
.PHONY
:
install
install_unsupported
:
...
...
cmd/ipfs/Rules.mk
View file @
aac4088c
...
...
@@ -12,12 +12,20 @@ PATH := $(realpath $(d)):$(PATH)
# DEPS_OO_$(d) += merkledag/pb/merkledag.pb.go namesys/pb/namesys.pb.go
# DEPS_OO_$(d) += pin/internal/pb/header.pb.go unixfs/pb/unixfs.pb.go
$(IPFS_BIN_$(d))
:
GOFLAGS += -ldflags="-X "github.com/ipfs/go-ipfs/repo/config".CurrentCommit=$(shell git rev-parse --short HEAD)"
$(d)_flags
=
-ldflags
=
"-X "
github.com/ipfs/go-ipfs/repo/config
".CurrentCommit=
$(
shell
git rev-parse --short HEAD
)
"
$(IPFS_BIN_$(d))
:
GOFLAGS += $(cmd/ipfs_flags)
# uses second expansion to collect all $(DEPS_GO)
$(IPFS_BIN_$(d))
:
$(d) $$(DEPS_GO) ALWAYS
#
| $(DEPS_OO_$(d))
$
(
go-build
)
$(d)-install
:
GOFLAGS += $(cmd/ipfs_flags)
$(d)-install
:
go
install
$
(
go-flags-with-tags
)
./cmd/ipfs
.PHONY
:
$(d)-install
COVER_BIN_$(d)
:=
$(d)
/ipfs-test-cover
CLEAN
+=
$
(
COVER_BIN_
$(d)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment