From 8a4261203136f27c6941f5f2034d8b64f2896723 Mon Sep 17 00:00:00 2001 From: mikael Date: Wed, 29 Apr 2020 17:32:00 +0200 Subject: [PATCH] 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. --- CHANGELOG.md | 1 + logging/logging_arm64.go | 2 +- logging/logging_other.go | 3 +-- 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