aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Sugarbroad <jpsugar@google.com>2018-07-25 15:06:10 -0700
committerDan Willemsen <dwillemsen@google.com>2020-06-29 15:53:37 -0700
commit0ca84cd97acdf6d1874108984530e65ce20fa62a (patch)
treef6fc1a0ef93fc7bb278fea12e1830cebe4c72e2f
parentc11012e8fccc6af230501c292398e09d2c53c9be (diff)
downloadplatform_build_kati-0ca84cd97acdf6d1874108984530e65ce20fa62a.tar.gz
platform_build_kati-0ca84cd97acdf6d1874108984530e65ce20fa62a.tar.bz2
platform_build_kati-0ca84cd97acdf6d1874108984530e65ce20fa62a.zip
Support git submodules in version.cc generation.
Bug: 109817231 Change-Id: I52520c01ee0e2ff452ef12e7fd49ee287d6cb369
-rw-r--r--Makefile.ckati4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.ckati b/Makefile.ckati
index 528f56f..6d45095 100644
--- a/Makefile.ckati
+++ b/Makefile.ckati
@@ -102,10 +102,10 @@ $(KATI_CXX_TEST_EXES): $(KATI_BIN_PATH)/%: $(KATI_INTERMEDIATES_PATH)/%.o
$(KATI_LD) $^ -o $@ $(KATI_LIBS)
# Rule to generate version.cc
-KATI_GIT_DIR := $(shell git -C $(KATI_SRC_PATH) rev-parse --show-toplevel)
+KATI_GIT_DIR := $(shell cd $(KATI_SRC_PATH); realpath `git rev-parse --git-dir`)
KATI_VERSION_DEPS :=
ifneq ($(KATI_GIT_DIR),)
-KATI_VERSION_DEPS := $(wildcard $(KATI_GIT_DIR)/.git/HEAD $(KATI_GIT_DIR)/.git/index)
+KATI_VERSION_DEPS := $(wildcard $(KATI_GIT_DIR)/HEAD $(KATI_GIT_DIR)/index)
endif
ifneq ($(KATI_VERSION_DEPS),)
KATI_VERSION := $(shell git -C $(KATI_GIT_DIR) rev-parse HEAD)