From a4841aeed697698f22a27023f8a9e63c950be838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=B6=85?= Date: Mon, 16 Oct 2023 14:39:27 +0800 Subject: [PATCH] extension: fix enterprise git commit hash display in `tidb-server -V` (#47647) close pingcap/tidb#47646 --- Makefile.common | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.common b/Makefile.common index 8731f1c9a50c0..87be9baaa2f88 100644 --- a/Makefile.common +++ b/Makefile.common @@ -67,8 +67,8 @@ LDFLAGS += -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBGitBranch=$(shel LDFLAGS += -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBEdition=$(TIDB_EDITION)" EXTENSION_FLAG = -ifeq ($(shell if [ -d extension/enterprise/.git ]; then echo "true"; fi),true) - EXTENSION_FLAG += -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBEnterpriseExtensionGitHash=$(shell cd extension/enterprise && git rev-parse HEAD)" +ifeq ($(shell if [ -d .git/modules/extension/enterprise ]; then echo "true"; fi),true) + EXTENSION_FLAG += -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBEnterpriseExtensionGitHash=$(shell cd pkg/extension/enterprise && git rev-parse HEAD)" endif TEST_LDFLAGS = -X "github.com/pingcap/tidb/pkg/config.checkBeforeDropLDFlag=1"