Remove unnecessary +build tags

The go:build tags are sufficient and the +build tags are no longer needed since switching to Go 1.18 in commit 73ea1b3 ("go.mod: update to go 1.18").
tklauser · Jan 5, 2024 · a6279df · a6279df
1 parent 8586810
commit a6279df
Show file tree

Hide file tree

Showing 47 changed files with 2 additions and 51 deletions.
diff --git a/cgotest/sysconf_cgotest.go b/cgotest/sysconf_cgotest.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package sysconf_cgotest
 

diff --git a/example_test.go b/example_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package sysconf_test
 

diff --git a/mksysconf.go b/mksysconf.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package main
 
@@ -33,16 +32,14 @@ func gensysconf(in, out, goos, goarch string) error {
 		return err
 	}
 
-	goBuild, build := goos, goos
+	goBuild := goos
 	if goarch != "" {
 		goBuild = fmt.Sprintf("%s && %s", goos, goarch)
-		build = fmt.Sprintf("%s,%s", goos, goarch)
 	}
 
 	r := fmt.Sprintf(`$1
 
-//go:build %s
-// +build %s`, goBuild, build)
+//go:build %s`, goBuild)
 	cgoCommandRegex := regexp.MustCompile(`(cgo -godefs .*)`)
 	b = cgoCommandRegex.ReplaceAll(b, []byte(r))
 

diff --git a/sysconf_bsd.go b/sysconf_bsd.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin || dragonfly || freebsd || netbsd || openbsd
-// +build darwin dragonfly freebsd netbsd openbsd
 
 package sysconf
 

diff --git a/sysconf_defs_darwin.go b/sysconf_defs_darwin.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package sysconf
 

diff --git a/sysconf_defs_dragonfly.go b/sysconf_defs_dragonfly.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package sysconf
 

diff --git a/sysconf_defs_freebsd.go b/sysconf_defs_freebsd.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package sysconf
 

diff --git a/sysconf_defs_linux.go b/sysconf_defs_linux.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package sysconf
 

diff --git a/sysconf_defs_netbsd.go b/sysconf_defs_netbsd.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package sysconf
 

diff --git a/sysconf_defs_openbsd.go b/sysconf_defs_openbsd.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package sysconf
 

diff --git a/sysconf_defs_solaris.go b/sysconf_defs_solaris.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package sysconf
 

diff --git a/sysconf_generic.go b/sysconf_generic.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd linux netbsd openbsd
 
 package sysconf
 

diff --git a/sysconf_posix.go b/sysconf_posix.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin || dragonfly || freebsd || linux || openbsd
-// +build darwin dragonfly freebsd linux openbsd
 
 package sysconf
 

diff --git a/sysconf_test.go b/sysconf_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package sysconf_test
 

diff --git a/sysconf_unsupported.go b/sysconf_unsupported.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris
-// +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris
 
 package sysconf
 

diff --git a/sysconf_values_freebsd.go b/sysconf_values_freebsd.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package sysconf
 

diff --git a/sysconf_values_linux.go b/sysconf_values_linux.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package sysconf
 

diff --git a/sysconf_values_netbsd.go b/sysconf_values_netbsd.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package sysconf
 

diff --git a/zsysconf_defs_darwin.go b/zsysconf_defs_darwin.go
diff --git a/zsysconf_defs_dragonfly.go b/zsysconf_defs_dragonfly.go
diff --git a/zsysconf_defs_freebsd.go b/zsysconf_defs_freebsd.go
diff --git a/zsysconf_defs_linux.go b/zsysconf_defs_linux.go
diff --git a/zsysconf_defs_netbsd.go b/zsysconf_defs_netbsd.go
diff --git a/zsysconf_defs_openbsd.go b/zsysconf_defs_openbsd.go
diff --git a/zsysconf_defs_solaris.go b/zsysconf_defs_solaris.go
diff --git a/zsysconf_values_freebsd_386.go b/zsysconf_values_freebsd_386.go
diff --git a/zsysconf_values_freebsd_amd64.go b/zsysconf_values_freebsd_amd64.go
diff --git a/zsysconf_values_freebsd_arm.go b/zsysconf_values_freebsd_arm.go
diff --git a/zsysconf_values_freebsd_arm64.go b/zsysconf_values_freebsd_arm64.go
diff --git a/zsysconf_values_freebsd_riscv64.go b/zsysconf_values_freebsd_riscv64.go
diff --git a/zsysconf_values_linux_386.go b/zsysconf_values_linux_386.go
diff --git a/zsysconf_values_linux_amd64.go b/zsysconf_values_linux_amd64.go
diff --git a/zsysconf_values_linux_arm.go b/zsysconf_values_linux_arm.go
diff --git a/zsysconf_values_linux_arm64.go b/zsysconf_values_linux_arm64.go
diff --git a/zsysconf_values_linux_loong64.go b/zsysconf_values_linux_loong64.go
diff --git a/zsysconf_values_linux_mips.go b/zsysconf_values_linux_mips.go
diff --git a/zsysconf_values_linux_mips64.go b/zsysconf_values_linux_mips64.go
diff --git a/zsysconf_values_linux_mips64le.go b/zsysconf_values_linux_mips64le.go
diff --git a/zsysconf_values_linux_mipsle.go b/zsysconf_values_linux_mipsle.go
diff --git a/zsysconf_values_linux_ppc64.go b/zsysconf_values_linux_ppc64.go
diff --git a/zsysconf_values_linux_ppc64le.go b/zsysconf_values_linux_ppc64le.go
diff --git a/zsysconf_values_linux_riscv64.go b/zsysconf_values_linux_riscv64.go
diff --git a/zsysconf_values_linux_s390x.go b/zsysconf_values_linux_s390x.go
diff --git a/zsysconf_values_netbsd_386.go b/zsysconf_values_netbsd_386.go
diff --git a/zsysconf_values_netbsd_amd64.go b/zsysconf_values_netbsd_amd64.go
diff --git a/zsysconf_values_netbsd_arm.go b/zsysconf_values_netbsd_arm.go
diff --git a/zsysconf_values_netbsd_arm64.go b/zsysconf_values_netbsd_arm64.go