From 7b66b49e8f5bffbc885658f36f0fb854dfba77e8 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Mon, 2 Jan 2017 13:03:18 +0100 Subject: [PATCH] android: re-generate git_sha1.h if git HEAD updated (v2) Generated header git_sha1.h has to depend on the git HEAD otherwise it will never be updated. v2: use absolute path for --git-dir option, in order to support cases when Android.gen.mk is invoked by other makefiles --- src/mesa/Android.gen.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/Android.gen.mk b/src/mesa/Android.gen.mk index a985f0a64b1..7c87d7d57ef 100644 --- a/src/mesa/Android.gen.mk +++ b/src/mesa/Android.gen.mk @@ -69,12 +69,12 @@ define es-gen $(hide) $(PRIVATE_SCRIPT) $(1) $(PRIVATE_XML) > $@ endef -$(intermediates)/main/git_sha1.h: +$(intermediates)/main/git_sha1.h: $(MESA_TOP)/.git/HEAD @mkdir -p $(dir $@) @echo "GIT-SHA1: $(PRIVATE_MODULE) <= git" $(hide) touch $@ $(hide) if which git > /dev/null; then \ - git --git-dir $(PRIVATE_PATH)/../../.git log -n 1 --oneline | \ + git --git-dir $(MESA_TOP)/.git log -n 1 --oneline | \ sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \ > $@; \ fi -- 2.11.0