Re-allow building without seccomp installed

I think cri-o#3300 regressed cri-o#218 by unconditionally compiling with seccomp enabled. cri-o#6488 fixed this for non-linux and non-cgo build platforms, but the issue still exists when one uses a cgo-enabled Linux build host but still wants to build without seccomp. In such case build ends quickly with pkg-config error: `Package 'libseccomp' not found`. This patch makes internal/config/seccomp respect the seccomp buildtag. Signed-off-by: Michal Sieron <michalwsieron@gmail.com>
xw19 · Dec 4, 2024 · 7aa784c · 7aa784c
1 parent 2b34016
commit 7aa784c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/internal/config/seccomp/notifier.go b/internal/config/seccomp/notifier.go
@@ -1,5 +1,5 @@
-//go:build linux && cgo
-// +build linux,cgo
+//go:build seccomp && linux && cgo
+// +build seccomp,linux,cgo
 
 package seccomp
 

diff --git a/internal/config/seccomp/seccomp.go b/internal/config/seccomp/seccomp.go
@@ -1,5 +1,5 @@
-//go:build linux && cgo
-// +build linux,cgo
+//go:build seccomp && linux && cgo
+// +build seccomp,linux,cgo
 
 package seccomp
 

diff --git a/internal/config/seccomp/seccomp_unsupported.go b/internal/config/seccomp/seccomp_unsupported.go
@@ -1,5 +1,5 @@
-//go:build !(linux && cgo)
-// +build !linux !cgo
+//go:build !(seccomp && linux && cgo)
+// +build !seccomp !linux !cgo
 
 package seccomp