summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean E. Russell <ser@ser1.net>2021-07-20 09:33:09 -0500
committerSean E. Russell <ser@ser1.net>2021-07-20 09:33:09 -0500
commit8d0c828e9185422c98d831f37e569e1ee6d03654 (patch)
tree4569c34b63b1b2b10e563a17d1c87fbaecf9252b
parentbda9b394d07ac1cec2e00de20b8734e30628816d (diff)
parent1e59a0a92689469794ea1216536de52018f1336f (diff)
Merge remote-tracking branch 'darwinArm/darwin-arm64-dup2'
-rw-r--r--logging/logging_arm64.go2
-rw-r--r--logging/logging_other.go8
2 files changed, 6 insertions, 4 deletions
diff --git a/logging/logging_arm64.go b/logging/logging_arm64.go
index b88c479..9d62f0f 100644
--- a/logging/logging_arm64.go
+++ b/logging/logging_arm64.go
@@ -1,4 +1,4 @@
-// +build !freebsd,arm64
+// +build !freebsd,!darwin,arm64
package logging
diff --git a/logging/logging_other.go b/logging/logging_other.go
index e910821..d7d75d5 100644
--- 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)