From 36bdfef6b56c8cabd30dacf0dbf307f7f7b2beac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Sun, 30 Jun 2019 18:33:20 +0200 Subject: Make a "git describe" fall back for older git versions --first-parent is not available on CentOS 7. --- core/erlc.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/erlc.mk b/core/erlc.mk index 7711fd9..253aead 100644 --- a/core/erlc.mk +++ b/core/erlc.mk @@ -309,7 +309,9 @@ endef ebin/$(PROJECT).app:: $(ERL_FILES) $(CORE_FILES) $(wildcard src/$(PROJECT).app.src) $(eval FILES_TO_COMPILE := $(filter-out src/$(PROJECT).app.src,$?)) $(if $(strip $(FILES_TO_COMPILE)),$(call compile_erl,$(FILES_TO_COMPILE))) - $(eval GITDESCRIBE := $(shell git describe --dirty --abbrev=7 --tags --always --first-parent 2>/dev/null || true)) +# Older git versions do not have the --first-parent flag. Do without in that case. + $(eval GITDESCRIBE := $(shell git describe --dirty --abbrev=7 --tags --always --first-parent 2>/dev/null \ + || git describe --dirty --abbrev=7 --tags --always 2>/dev/null || true)) $(eval MODULES := $(patsubst %,'%',$(sort $(notdir $(basename \ $(filter-out $(ERLC_EXCLUDE_PATHS),$(ERL_FILES) $(CORE_FILES) $(BEAM_FILES))))))) ifeq ($(wildcard src/$(PROJECT).app.src),) -- cgit v1.2.3