Skip to content

Commit

Permalink
extension: fix enterprise git commit hash display in tidb-server -V (…
Browse files Browse the repository at this point in the history 
…pingcap#47647)

close pingcap#47646
  • Loading branch information
@lcwangchao @wuhuizuo
lcwangchao authored and wuhuizuo committed Apr 2, 2024
1 parent 407e8b4 commit a4841ae
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile.common
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit a4841ae

Please sign in to comment.