Skip to content

Commit

Permalink
Fix pam_adsys build
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
GabrielNagy committed Sep 25, 2023
1 parent 6f70411 commit f293785
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export GOCACHE=$(shell mktemp -d /tmp/gocache-XXXX)

WIN_ARCHS := amd64 arm64
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)
Expand Down Expand Up @@ -81,4 +81,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 ./...

0 comments on commit f293785

Please sign in to comment.