diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2020-06-29 14:51:37 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2020-06-29 15:08:47 -0700 |
| commit | 47cd9028e777e4247d54fabd2afff5df4a82958e (patch) | |
| tree | 37c87baf06bf6e661e7738f5988237709ebb2e02 | |
| parent | c5c05da345b72cf3be23128c85d184bd8dddac7f (diff) | |
| download | platform_build_kati-47cd9028e777e4247d54fabd2afff5df4a82958e.tar.gz platform_build_kati-47cd9028e777e4247d54fabd2afff5df4a82958e.tar.bz2 platform_build_kati-47cd9028e777e4247d54fabd2afff5df4a82958e.zip | |
Support building in a git worktree
A git worktree uses a .git that's just a file, so the dependencies that
assume that it is a directory breaks the build. Just ignore the embedded
git version if we can't find the files to depend upon.
Change-Id: I85dea2849bf12dcfa758e2f92a0161597e85d98e
| -rw-r--r-- | Makefile.ckati | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.ckati b/Makefile.ckati index b0a20b2..528f56f 100644 --- a/Makefile.ckati +++ b/Makefile.ckati @@ -103,11 +103,13 @@ $(KATI_CXX_TEST_EXES): $(KATI_BIN_PATH)/%: $(KATI_INTERMEDIATES_PATH)/%.o # Rule to generate version.cc KATI_GIT_DIR := $(shell git -C $(KATI_SRC_PATH) rev-parse --show-toplevel) +KATI_VERSION_DEPS := ifneq ($(KATI_GIT_DIR),) -KATI_VERSION_DEPS := $(KATI_GIT_DIR)/.git/HEAD $(KATI_GIT_DIR)/.git/index +KATI_VERSION_DEPS := $(wildcard $(KATI_GIT_DIR)/.git/HEAD $(KATI_GIT_DIR)/.git/index) +endif +ifneq ($(KATI_VERSION_DEPS),) KATI_VERSION := $(shell git -C $(KATI_GIT_DIR) rev-parse HEAD) else -KATI_VERSION_DEPS := KATI_VERSION := unknown endif $(KATI_INTERMEDIATES_PATH)/version.cc: $(KATI_VERSION_DEPS) |