Use the current archlinux recommended build settings for go packages

2 files changed, 10 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84659de3e740..dcebbadb3f12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = syncthing-discosrv
 	pkgdesc = Discover server for the syncthing P2P synchronization utility
 	pkgver = 1.17.0
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = http://syncthing.net
 	install = syncthing-discosrv.install
diff --git a/PKGBUILD b/PKGBUILD
index 6ea65633ea15..c0e3afcb59bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ _pkgname=syncthing
 pkgname=$_pkgname-discosrv
 epoch=1
 pkgver=1.17.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Discover server for the syncthing P2P synchronization utility'
 url='http://syncthing.net'
 license=('MIT')
@@ -40,7 +40,14 @@ prepare() {
 build() {
   export GOPATH="$srcdir"
   cd src/github.com/$_pkgname/$_pkgname/cmd/stdiscosrv
-  go build -modcacherw -x -i -v -ldflags -w
+
+  go build \
+    -trimpath \
+    -buildmode=pie \
+    -mod=readonly \
+    -modcacherw \
+    -ldflags "-linkmode external -extldflags \"${LDFLAGS}\"" \
+    .
 }
 
 package() {