From b7d2c3c8056ef6d24fc7c22c717fcf7bd3cf27f7 Mon Sep 17 00:00:00 2001
From: Gabriel Nagy <gabriel.nagy@canonical.com>
Date: Mon, 25 Sep 2023 12:16:39 +0300
Subject: [PATCH] Fix pam_adsys build

It looks like multiple -tags statements override each other so we must
specify them in a comma separated way. This fixes the issue where
pam_adsys is not built and shipped anymore.
---
 debian/rules | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index c8b12fffa..43646c6ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,9 @@
 export GOCACHE=$(shell mktemp -d /tmp/gocache-XXXX)
 
 WIN_ARCHS := amd64 arm64
+# Tags should always come last as we append to them in other parts of the build
 COMMON_GOFLAGS := -ldflags=-X=github.com/ubuntu/adsys/internal/consts.Version=$(shell dpkg-parsechangelog -S Version) -mod=vendor -tags=withmo
-export GOFLAGS := $(COMMON_GOFLAGS) -buildmode=pie
+export GOFLAGS := -buildmode=pie $(COMMON_GOFLAGS)
 export WIN_GOFLAGS := $(COMMON_GOFLAGS)
 # PIE on Windows is only supported for amd64
 ifeq ($(shell dpkg --print-architecture),amd64)
@@ -81,4 +82,4 @@ endif
 	# Create adsysctl command
 	ln -s adsysd debian/tmp/sbin/adsysctl
 	# Run go generate to install assets, but don’t regenerate them
-	GENERATE_ONLY_INSTALL_TO_DESTDIR=$(CURDIR)/debian/tmp go generate -x -tags tools $(GOFLAGS) ./...
+	GENERATE_ONLY_INSTALL_TO_DESTDIR=$(CURDIR)/debian/tmp go generate -x $(GOFLAGS),tools ./...