extension: fix make enterprise-server failed (pingcap#47658)

close pingcap#47646
wuhuizuo · Apr 2, 2024 · 1b220f5 · 1b220f5
1 parent b57642a
commit 1b220f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -171,7 +171,7 @@ else
 endif
 
 init-submodule:
-	# git submodule init && git submodule update --force
+	git submodule init && git submodule update --force
 
 enterprise-prepare:
 	cd pkg/extension/enterprise/generate && $(GO) generate -run genfile main.go

diff --git a/Makefile.common b/Makefile.common
@@ -67,7 +67,7 @@ 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 .git/modules/extension/enterprise ]; then echo "true"; fi),true)
+ifeq ($(shell if [ -f pkg/extension/enterprise/.git ]; 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