Merge remote-tracking branch 'darwinArm/darwin-arm64-dup2'

2021-07-20 09:33:09 -05:00 · 2021-07-20 09:33:09 -05:00 · 8d0c828e91
commit 8d0c828e91
parent bda9b394d0 1e59a0a926
2 changed files with 6 additions and 4 deletions
--- a/logging/logging_arm64.go
+++ b/logging/logging_arm64.go
@ -1,4 +1,4 @@
-// +build !freebsd,arm64
+// +build !freebsd,!darwin,arm64

 package logging

--- a/logging/logging_other.go
+++ b/logging/logging_other.go
@ -1,9 +1,11 @@
-// +build linux,!arm64 openbsd,!arm64 freebsd darwin,!arm64
+// +build linux,!arm64 openbsd,!arm64 freebsd darwin

 package logging

-import "syscall"
-import "os"
+import (
+	"os"
+	"syscall"
+)

 func stderrToLogfile(logfile *os.File) {
 	syscall.Dup2(int(logfile.Fd()), 2)