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
rust-lang · Nov 10, 2014 · 7c36336 · 7c36336 · bors · Nov 10, 2014
1 parent c254957
commit 7c36336
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/mk/main.mk b/mk/main.mk
@@ -52,7 +52,7 @@ CFG_GIT_DIR := $(CFG_SRC_DIR).git
 # so we use a hack: define $(SPACE) which contains space character.
 SPACE :=
 SPACE +=
-ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT))),)
+ifneq ($(CFG_GIT),)
 ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT_DIR))),)
     CFG_VER_DATE = $(shell git --git-dir='$(CFG_GIT_DIR)' log -1 --pretty=format:'%ci')
     CFG_VER_HASH = $(shell git --git-dir='$(CFG_GIT_DIR)' rev-parse HEAD)