Skip to content

Commit e24dd1b

Browse files
authored
Merge pull request kmesh-net#989 from hzxuzhonghu/update-static-compilr
Static compile cni and ctl
2 parents 979b850 + 236a8cc commit e24dd1b

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

Makefile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ LDFLAGS := "-X google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=w
4141
-X kmesh.net/kmesh/pkg/version.buildDate=$(BUILD_DATE) \
4242
-linkmode=external -extldflags $(EXTLDFLAGS)"
4343

44+
GOLDFLAGS := "-X google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=warn \
45+
-X kmesh.net/kmesh/pkg/version.gitVersion=$(VERSION) \
46+
-X kmesh.net/kmesh/pkg/version.gitCommit=$(GIT_COMMIT_HASH) \
47+
-X kmesh.net/kmesh/pkg/version.gitTreeState=$(GIT_TREESTATE) \
48+
-X kmesh.net/kmesh/pkg/version.buildDate=$(BUILD_DATE) \
49+
-extldflags '-static'"
50+
4451
# target
4552
APPS1 := kmesh-daemon
4653
APPS2 := mdacore
@@ -93,11 +100,11 @@ all:
93100

94101
$(call printlog, BUILD, $(APPS3))
95102
$(QUIET) (export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(ROOT_DIR)mk; \
96-
$(GO) build -ldflags $(LDFLAGS) -tags $(ENHANCED_KERNEL) -o $(APPS3) $(GOFLAGS) ./cniplugin/main.go)
103+
CGO_ENABLED=0 $(GO) build -ldflags $(GOLDFLAGS) -o $(APPS3) $(GOFLAGS) ./cniplugin/main.go)
97104

98105
$(call printlog, BUILD, $(APPS4))
99106
$(QUIET) (export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(ROOT_DIR)mk; \
100-
$(GO) build -ldflags $(LDFLAGS) -o $(APPS4) $(GOFLAGS) ./ctl/main.go)
107+
CGO_ENABLED=0 $(GO) build -ldflags $(GOLDFLAGS) -o $(APPS4) $(GOFLAGS) ./ctl/main.go)
101108

102109
OUT ?= kmeshctl
103110
.PHONY: kmeshctl

0 commit comments

Comments
 (0)