build(make): Change TAGS behavior to always include required build tags

Signed-off-by: Alf-Rune Siqveland <alf.rune@northern.tech>
mendersoftware · Sep 5, 2024 · 5bae608 · 5bae608
1 parent 6b0b733
commit 5bae608
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/backend/services/Makefile.common b/backend/services/Makefile.common
@@ -20,7 +20,7 @@ CGO_ENABLED ?= 0
 GOARCH ?= $(shell go env GOARCH)
 GOOS ?= $(shell go env GOOS)
 
-TAGS ?= $(TAGS_DEFAULT)
+TAGS ?=
 LDFLAGS ?= -s -w
 BUILDFLAGS ?= -trimpath
 TESTFLAGS ?=
@@ -30,7 +30,7 @@ PYTEST_ARGS ?=
 _none :=
 _space := $(_none) $(_none)
 _comma := ,
-BUILDFLAGS += $(let tags,$(TAGS),-tags=$(subst $(_space),$(_comma),$(tags)))
+BUILDFLAGS += $(let tags,$(TAGS) $(TAGS_REQUIRED),-tags=$(subst $(_space),$(_comma),$(tags)))
 
 # DOCKER_PLATFORM default is defined with respect to the docker server.
 # This fixes the default case on darwin where docker is running inside a VM (linux).

diff --git a/backend/services/deployments/Makefile b/backend/services/deployments/Makefile
@@ -1,5 +1,5 @@
 COMPONENT := deployments
 
-TAGS_DEFAULT := nopkcs11
+override TAGS_REQUIRED := nopkcs11
 
 include ../Makefile.common