Skip to content

Commit f6fa3fd

Browse files
dmcgowandmcgowan
authored
Merge pull request #5590 from oss-qm/submit/makefile-tags
Makefile: fix passing build tags
2 parents 559f9a5 + 2bb8ad7 commit f6fa3fd

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ ifdef BUILDTAGS
8989
endif
9090
GO_BUILDTAGS ?=
9191
GO_BUILDTAGS += ${DEBUG_TAGS}
92-
GO_TAGS=$(if $(GO_BUILDTAGS),-tags "$(GO_BUILDTAGS)",)
92+
GO_TAGS=$(if $(GO_BUILDTAGS),-tags "$(strip $(GO_BUILDTAGS))",)
9393
GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) $(EXTRA_LDFLAGS)'
9494
SHIM_GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) -extldflags "-static" $(EXTRA_LDFLAGS)'
9595

@@ -244,11 +244,11 @@ genman: man/containerd.8 man/ctr.8
244244

245245
man/containerd.8: FORCE
246246
@echo "$(WHALE) $@"
247-
$(GO) run cmd/gen-manpages/main.go $(@F) $(@D)
247+
$(GO) run ${GO_TAGS} cmd/gen-manpages/main.go $(@F) $(@D)
248248

249249
man/ctr.8: FORCE
250250
@echo "$(WHALE) $@"
251-
$(GO) run cmd/gen-manpages/main.go $(@F) $(@D)
251+
$(GO) run ${GO_TAGS} cmd/gen-manpages/main.go $(@F) $(@D)
252252

253253
man/%: docs/man/%.md FORCE
254254
@echo "$(WHALE) $@"

0 commit comments

Comments
 (0)