diff options
| author | Loïc Hoguin <[email protected]> | 2019-06-30 18:33:20 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2019-06-30 18:33:20 +0200 |
| commit | 36bdfef6b56c8cabd30dacf0dbf307f7f7b2beac (patch) | |
| tree | df79039860a8a2122d7a471dea083c415bc28f34 | |
| parent | 977617f747c198660e4b16eb9acc00d9727d820c (diff) | |
| download | erlang.mk-36bdfef6b56c8cabd30dacf0dbf307f7f7b2beac.tar.gz erlang.mk-36bdfef6b56c8cabd30dacf0dbf307f7f7b2beac.tar.bz2 erlang.mk-36bdfef6b56c8cabd30dacf0dbf307f7f7b2beac.zip | |
Make a "git describe" fall back for older git versions
--first-parent is not available on CentOS 7.
| -rw-r--r-- | core/erlc.mk | 4 |
1 files changed, 3 insertions, 1 deletions
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),) |