From 21607ead9cadb9c64b1e443c442a4395e4bb48b5 Mon Sep 17 00:00:00 2001 From: Sven Rebhan <36194019+srebhan@users.noreply.github.com> Date: Wed, 8 Jun 2022 22:45:45 +0200 Subject: [PATCH] fix: Always build README-embedder for host-architecture (#11253) --- Makefile | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 2656307c6..063b4f47e 100644 --- a/Makefile +++ b/Makefile @@ -70,15 +70,14 @@ localstatedir ?= $(prefix)/var pkgdir ?= build/dist .PHONY: all -all: - @$(MAKE) deps - @$(MAKE) telegraf +all: deps docs telegraf .PHONY: help help: @echo 'Targets:' @echo ' all - download dependencies and compile telegraf binary' @echo ' deps - download dependencies' + @echo ' docs - embed sample-configurations into READMEs' @echo ' telegraf - compile telegraf binary' @echo ' test - run short unit tests' @echo ' fmt - format source files' @@ -115,22 +114,21 @@ versioninfo: go run scripts/generate_versioninfo/main.go; \ go generate cmd/telegraf/telegraf_windows.go; \ -.PHONY: build_generator -build_generator: - go build -o ./tools/readme_config_includer/generator ./tools/readme_config_includer/generator.go +build_tools: + $(HOSTGO) build -o ./tools/readme_config_includer/generator ./tools/readme_config_includer/generator.go -embed_readme_%: build_generator +embed_readme_%: go generate -run="readme_config_includer/generator$$" ./plugins/$*/... -.PHONY: generate -generate: embed_readme_inputs embed_readme_outputs embed_readme_processors embed_readme_aggregators +.PHONY: docs +docs: build_tools embed_readme_inputs embed_readme_outputs embed_readme_processors embed_readme_aggregators .PHONY: build build: go build -ldflags "$(LDFLAGS)" ./cmd/telegraf .PHONY: telegraf -telegraf: generate build +telegraf: build # Used by dockerfile builds .PHONY: go-install @@ -328,7 +326,7 @@ darwin-arm64: include_packages := $(mips) $(mipsel) $(arm64) $(amd64) $(static) $(armel) $(armhf) $(riscv64) $(s390x) $(ppc64le) $(i386) $(windows) $(darwin-amd64) $(darwin-arm64) .PHONY: package -package: generate $(include_packages) +package: docs $(include_packages) .PHONY: $(include_packages) $(include_packages):