diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-11-10 09:54:25 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-11-10 14:57:21 -0800 |
| commit | 7c36336c6f94d49bdfdf5cbf0c09e353c79534a4 (patch) | |
| tree | b1a9aac0172a5fb19f2316c98a1256ef5f2b3411 | |
| parent | c254957078207047a224d6e16c46ff53299bfd78 (diff) | |
mk: Fix configuration of version commit information
Commit bec2ee77f78b4bb8a503101091272a634a273a1c 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
| -rw-r--r-- | mk/main.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/main.mk b/mk/main.mk index aba02088eab..3df4d3bfa5e 100644 --- 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) |