Skip to content

Commit 7c36336

Browse files
committed
mk: Fix configuration of version commit information
Commit bec2ee7 started quoting paths discovered as part of the `probe` function, which includes git. The `make` `wildcard` function appears to be incompatible with quoted paths so this check in the makefile now fails. Employing `wildcard` here appears to only re-verify that git actually exists, which the configure script already did, so I've just removed it. Additionally, with the quoted paths the `subst` function should no longer be needed, so I've removed it as well. Closes #18771
1 parent c254957 commit 7c36336

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

mk/main.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ CFG_GIT_DIR := $(CFG_SRC_DIR).git
5252
# so we use a hack: define $(SPACE) which contains space character.
5353
SPACE :=
5454
SPACE +=
55-
ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT))),)
55+
ifneq ($(CFG_GIT),)
5656
ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT_DIR))),)
5757
CFG_VER_DATE = $(shell git --git-dir='$(CFG_GIT_DIR)' log -1 --pretty=format:'%ci')
5858
CFG_VER_HASH = $(shell git --git-dir='$(CFG_GIT_DIR)' rev-parse HEAD)

0 commit comments

Comments
 (0)