summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormikael <mikael@FreeBSD.org>2020-04-29 17:32:00 +0200
committerSean E. Russell <ser@ser1.net>2020-05-28 18:20:58 -0500
commit8a4261203136f27c6941f5f2034d8b64f2896723 (patch)
treeefcd1959ed96e0db43077fbbcaeabe70c0413acb
parent06ee1ad9491f762d28fb1a748a1af6f8c37eec90 (diff)
Use dup2 on FreeBSD aarch64
Update changelog. Clears up the FreeBSD dup2 patch issues; the build flags were causing compile failures on other target OSes.
-rw-r--r--CHANGELOG.md1
-rw-r--r--logging/logging_arm64.go2
-rw-r--r--logging/logging_other.go3
3 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbc0077..4e3966f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Command line option to list layouts, paths, colorschemes, hotkeys, and filterable devices
- Adds ability to write out a configuration file
- Adds a command for specifying the configuration file to use
+- Added contribution from @wcdawn for building on machines w/ no Go/root access
### Changed
diff --git a/logging/logging_arm64.go b/logging/logging_arm64.go
index 03848bb..b88c479 100644
--- a/logging/logging_arm64.go
+++ b/logging/logging_arm64.go
@@ -1,4 +1,4 @@
-// +build arm64
+// +build !freebsd,arm64
package logging
diff --git a/logging/logging_other.go b/logging/logging_other.go
index fd88b83..e910821 100644
--- a/logging/logging_other.go
+++ b/logging/logging_other.go
@@ -1,5 +1,4 @@
-// +build linux openbsd freebsd darwin
-// +build !arm64
+// +build linux,!arm64 openbsd,!arm64 freebsd darwin,!arm64
package logging