mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'js/enhanced-version-info'
Build fix. * js/enhanced-version-info: Makefile: fix the "built from commit" code
This commit is contained in:
commit
5571d085b3
5
Makefile
5
Makefile
|
@ -2021,8 +2021,9 @@ version.sp version.s version.o: GIT-VERSION-FILE GIT-USER-AGENT
|
|||
version.sp version.s version.o: EXTRA_CPPFLAGS = \
|
||||
'-DGIT_VERSION="$(GIT_VERSION)"' \
|
||||
'-DGIT_USER_AGENT=$(GIT_USER_AGENT_CQ_SQ)' \
|
||||
'-DGIT_BUILT_FROM_COMMIT="$(shell GIT_CEILING_DIRECTORIES=\"$(CURDIR)/..\" \
|
||||
git rev-parse -q --verify HEAD || :)"'
|
||||
'-DGIT_BUILT_FROM_COMMIT="$(shell \
|
||||
GIT_CEILING_DIRECTORIES="$(CURDIR)/.." \
|
||||
git rev-parse -q --verify HEAD 2>/dev/null)"'
|
||||
|
||||
$(BUILT_INS): git$X
|
||||
$(QUIET_BUILT_IN)$(RM) $@ && \
|
||||
|
|
Loading…
Reference in a new issue