From 507391df4656f643a7f8b8770c3d5f52d8e86ced Mon Sep 17 00:00:00 2001
From: Luiz Aoqui <luiz@hashicorp.com>
Date: Tue, 13 Sep 2022 21:13:17 -0400
Subject: [PATCH] build: always set osusergo (#14583)

The way this tag was previous declared would cause it to be overwritten
when the GO_TAGS env var was set.
---
 GNUmakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GNUmakefile b/GNUmakefile
index 4285a6fcb..9707577d5 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -21,7 +21,7 @@ ifndef BIN
 BIN := $(GOPATH)/bin
 endif
 
-GO_TAGS ?= osusergo
+GO_TAGS := osusergo $(GO_TAGS)
 
 ifeq ($(CI),true)
 GO_TAGS := codegen_generated $(GO_TAGS)