Use my latest proposed patch for improved -v message. It is simpler and gives a better message, especially when repository has been locally modified: 'tcc version 0.9.27 mob:fef701b 2022-12-02T07:11:55+01:00 locally modified (ARM eabihf Linux)'. Hope it's Ok for maintainers

Christian Jullien committed 3 years ago

Commit 70158381 parent fef701b2 files · +5 −10Browse files

Unified · Split

2 files

 $(X)tccpp.o : $(TCCDEFS_H)
 endif
-GITHASH := $(shell git rev-parse >/dev/null 2>&1 && git rev-parse --short HEAD || echo no)
+FROM_GIT := $(shell git rev-parse >/dev/null 2>&1 && echo yes || echo no)
-ifneq ($(GITHASH),no)
-DEF_GITHASH := -DTCC_GITHASH="\"$(shell git rev-parse --abbrev-ref HEAD):$(GITHASH)$(shell git diff --quiet || echo ' - modified')\""
-endif
-GITDATE := $(shell git log -1 >/dev/null 2>&1 && git log -1 --pretty='format:%cI' || echo no)
+ifeq ($(FROM_GIT),yes)
-ifneq ($(GITDATE),no)
+GITHASH:=$(shell git rev-parse --abbrev-ref HEAD):$(shell git rev-parse --short HEAD) $(shell git log -1 --pretty='format:%cI')
-DEF_GITDATE := -DTCC_GITDATE="\"$(shell git log -1 --pretty='format:%cI')\""
+GITHASH+=$(shell git diff --quiet || echo locally modified)
+DEF_GITHASH := -DTCC_GITHASH="\"$(GITHASH)\""
 endif
 ifeq ($(CONFIG_debug),yes)

tcc.c+0−3

     "tcc version "TCC_VERSION
 #ifdef TCC_GITHASH
     " "TCC_GITHASH
-#endif
-#ifdef TCC_GITDATE
-    " on "TCC_GITDATE
 #endif
     " ("
 #ifdef TCC_TARGET_I386

Keyboard shortcuts