restore upstream ldflags

2 files changed, 9 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4feed66db24..781929939b36 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nvidia-container-toolkit
 	pkgdesc = NVIDIA container runtime toolkit
 	pkgver = 1.14.3
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/NVIDIA/nvidia-container-toolkit
 	arch = x86_64
 	license = Apache
diff --git a/PKGBUILD b/PKGBUILD
index 5ed4aec0816f..e00257221e11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Julie Shapiro <jshapiro at nvidia dot com>
 pkgname=nvidia-container-toolkit
 pkgver=1.14.3
-pkgrel=4
+pkgrel=5
 pkgdesc="NVIDIA container runtime toolkit"
 arch=('x86_64')
 url="https://github.com/NVIDIA/nvidia-container-toolkit"
@@ -32,13 +32,13 @@ prepare() {
 build() {
   cd "$pkgname-$pkgver"
   export GOPATH="$srcdir/gopath"
-  go build -v \
-    -trimpath \
-    -buildmode=pie \
-    -mod=vendor \
-    -modcacherw \
-    -ldflags "-linkmode external -extldflags \"${LDFLAGS}\" -s -w -X github.com/NVIDIA/nvidia-container-toolkit/internal/info.version=$pkgver" \
-    -o build ./...
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GO_LDFLAGS="-Wl,-z,lazy -s -w -X github.com/NVIDIA/nvidia-container-toolkit/internal/info.version=$pkgver,${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=vendor -modcacherw"
+  go build -v -o build ./...
 
   # Clean module cache for makepkg -C
   go clean -modcache