Skip to content

Commit 63d7a9c

Browse files
dmcgowandmcgowan
authored
Merge pull request #3096 from thaJeztah/override_package_name
Makefile: allow overriding package name
2 parents 3bba2d4 + b858cfb commit 63d7a9c

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

‎Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ DESTDIR=/usr/local
2222
# Used to populate variables in version package.
2323
VERSION=$(shell git describe --match 'v[0-9]*' --dirty='.m' --always)
2424
REVISION=$(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi)
25+
PACKAGE=github.com/containerd/containerd
2526

2627
ifneq "$(strip $(shell command -v go 2>/dev/null))" ""
2728
GOOS ?= $(shell go env GOOS)
@@ -90,8 +91,8 @@ endif
9091
GO_BUILDTAGS ?= seccomp apparmor
9192
GO_BUILDTAGS += ${DEBUG_TAGS}
9293
GO_TAGS=$(if $(GO_BUILDTAGS),-tags "$(GO_BUILDTAGS)",)
93-
GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PKG) $(EXTRA_LDFLAGS)'
94-
SHIM_GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PKG) -extldflags "-static" $(EXTRA_LDFLAGS)'
94+
GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) $(EXTRA_LDFLAGS)'
95+
SHIM_GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) -extldflags "-static" $(EXTRA_LDFLAGS)'
9596

9697
#Replaces ":" (*nix), ";" (windows) with newline for easy parsing
9798
GOPATHS=$(shell echo ${GOPATH} | tr ":" "\n" | tr ";" "\n")

0 commit comments

Comments
 (0)