Skip to content

Commit

Permalink
extension: fix make enterprise-server failed (#47658)
Browse files Browse the repository at this point in the history
close #47646
  • Loading branch information
lcwangchao authored Oct 16, 2023
1 parent eafb78a commit 4b0b47c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 4b0b47c

Please sign in to comment.