]> granicus.if.org Git - esp-idf/commitdiff
build: pass more arguments to git describe so that it always works even if detached...
authorEdmund Huber <me@ehuber.info>
Sun, 19 Mar 2017 19:06:37 +0000 (12:06 -0700)
committerAngus Gratton <angus@espressif.com>
Wed, 22 Mar 2017 06:51:47 +0000 (14:51 +0800)
Merges #441 https://github.com/espressif/esp-idf/pull/441

make/project.mk

index e1a23e96e9648e27c927e36e2e5675379bd5ac81..f5ae796f057b2e076fe5f9aa325163fafd4ffb57 100644 (file)
@@ -186,8 +186,7 @@ endif
        @echo $(ESPTOOLPY_WRITE_FLASH) $(ESPTOOL_ALL_FLASH_ARGS)
 
 
-# Git version of ESP-IDF (of the form v1.0-285-g5c4f707)
-IDF_VER := $(shell git -C $(IDF_PATH) describe)
+IDF_VER := $(shell git -C $(IDF_PATH) describe --always --tags --dirty)
 
 # Set default LDFLAGS