Skip to content

Commit 5571d08

Browse files
committed
Merge branch 'js/enhanced-version-info'
Build fix. * js/enhanced-version-info: Makefile: fix the "built from commit" code
2 parents bedb914 + 5cf8e06 commit 5571d08

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2021,8 +2021,9 @@ version.sp version.s version.o: GIT-VERSION-FILE GIT-USER-AGENT
20212021
version.sp version.s version.o: EXTRA_CPPFLAGS = \
20222022
'-DGIT_VERSION="$(GIT_VERSION)"' \
20232023
'-DGIT_USER_AGENT=$(GIT_USER_AGENT_CQ_SQ)' \
2024-
'-DGIT_BUILT_FROM_COMMIT="$(shell GIT_CEILING_DIRECTORIES=\"$(CURDIR)/..\" \
2025-
git rev-parse -q --verify HEAD || :)"'
2024+
'-DGIT_BUILT_FROM_COMMIT="$(shell \
2025+
GIT_CEILING_DIRECTORIES="$(CURDIR)/.." \
2026+
git rev-parse -q --verify HEAD 2>/dev/null)"'
20262027

20272028
$(BUILT_INS): git$X
20282029
$(QUIET_BUILT_IN)$(RM) $@ && \

0 commit comments

Comments
 (0)