aboutsummaryrefslogtreecommitdiff
path: root/src/os
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2021-05-02 13:22:48 +0200
committerTobias Klauser <tobias.klauser@gmail.com>2021-05-04 12:44:42 +0000
commit45600bcd614f5855060b18b189f7e126fedfe637 (patch)
tree9289c681a92acc31f25381b42634bdbbd7bc8019 /src/os
parent138d2c9b88d9e3d5adcebf9cb7c356b43d6a9782 (diff)
downloadgo-45600bcd614f5855060b18b189f7e126fedfe637.tar.gz
go-45600bcd614f5855060b18b189f7e126fedfe637.zip
os, syscall: use wait6 to avoid wait/kill race on netbsd
Follow CL 23967 and CL 24021 which did the same on linux and freebsd, respectively. Updates #13987 Updates #16028 Change-Id: I95b13d8ddde4cea1ef4fb7d655f1ad1a219d13aa Reviewed-on: https://go-review.googlesource.com/c/go/+/315281 Trust: Tobias Klauser <tobias.klauser@gmail.com> Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com> Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/os')
-rw-r--r--src/os/wait_unimp.go4
-rw-r--r--src/os/wait_wait6.go4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/os/wait_unimp.go b/src/os/wait_unimp.go
index 07b5b6b66b..9bb85da802 100644
--- a/src/os/wait_unimp.go
+++ b/src/os/wait_unimp.go
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-//go:build aix || darwin || (js && wasm) || netbsd || openbsd || solaris
-// +build aix darwin js,wasm netbsd openbsd solaris
+//go:build aix || darwin || (js && wasm) || openbsd || solaris
+// +build aix darwin js,wasm openbsd solaris
package os
diff --git a/src/os/wait_wait6.go b/src/os/wait_wait6.go
index 51193401f9..45b370a802 100644
--- a/src/os/wait_wait6.go
+++ b/src/os/wait_wait6.go
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-//go:build dragonfly || freebsd
-// +build dragonfly freebsd
+//go:build dragonfly || freebsd || netbsd
+// +build dragonfly freebsd netbsd
package os