fix linking issue from LDFLAGS

2 files changed, 8 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99708d2b1ad8..73d1d48ab9c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nvidia-container-runtime
 	pkgdesc = NVIDIA opencontainer runtime fork to expose GPU devices to containers.
 	pkgver = 3.10.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/NVIDIA/nvidia-container-toolkit
 	arch = x86_64
 	license = APACHE
@@ -9,7 +9,7 @@ pkgbase = nvidia-container-runtime
 	depends = libseccomp
 	depends = nvidia-container-toolkit>=1.9.0
 	options = !lto
-	source = v3.10.0-1.tar.gz::https://github.com/NVIDIA/nvidia-container-toolkit/archive/v1.10.0.tar.gz
+	source = v3.10.0-2.tar.gz::https://github.com/NVIDIA/nvidia-container-toolkit/archive/v1.10.0.tar.gz
 	sha256sums = 7c88e6b16df92feac9a14f7ca7f2960409c71760b2563fea29c57c8799930db3
 
 pkgname = nvidia-container-runtime
diff --git a/PKGBUILD b/PKGBUILD
index 95af9d70b687..c5393267050f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=nvidia-container-runtime
 # identical to nvidia-container-toolkit's PKGBUILD.
 
 pkgver=3.10.0
-pkgrel=1
+pkgrel=2
 
 toolkit_ver=1.10.0
 
@@ -36,15 +36,18 @@ build() {
 
   GO111MODULE=auto \
   GOPATH="${srcdir}/gopath" \
+  GOOS=linux \
   go build -v \
     -modcacherw \
     -buildmode=pie \
     -gcflags "all=-trimpath=${PWD}" \
     -asmflags "all=-trimpath=${PWD}" \
-    -ldflags "-s -w -extldflags ${LDFLAGS}" \
     -o bin \
     "./..."
-    # -trimpath \  # only go > 1.13
+    # using LDFLAGS is busted because -Wl breaks linking to cuDriver* for some reason :(
+    #-ldflags "-s -w -extldflags \"${LDFLAGS}\"" \
+    # only go > 1.13
+    # -trimpath \
 
   # go leaves a bunch of local stuff with 0400, making it break future `makepkg -C` _grumble grumble_
   GO111MODULE=auto \