From 9cb16b5b9e00a21e4f696052282df58fdd5fbb02 Mon Sep 17 00:00:00 2001 From: Sean Chittenden Date: Sat, 7 May 2016 10:42:01 -0700 Subject: [PATCH] Explicitly enumaret the build targets in _unix `!windows` was being used as the synonym for `darwin dragonfly freebsd linux netbsd openbsd solaris`. While I don't imagine `android` will be a prime target for Nomad in the near term, favor explicit build targets. List of build targets generated by Go 1.7's dist command: `go tool dist list | sort | cut -d '/' -f 1 | sort | uniq` --- client/allocdir/alloc_dir_unix.go | 2 +- client/driver/executor/executor_unix.go | 2 +- client/driver/logging/syslog_parser_unix.go | 2 +- client/driver/logging/syslog_parser_unix_test.go | 2 +- client/driver/logging/universal_collector_unix.go | 2 +- client/driver/utils_unix.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/allocdir/alloc_dir_unix.go b/client/allocdir/alloc_dir_unix.go index d5e4a9296..0e8bdd39a 100644 --- a/client/allocdir/alloc_dir_unix.go +++ b/client/allocdir/alloc_dir_unix.go @@ -1,4 +1,4 @@ -// +build !windows +// +build darwin dragonfly freebsd linux netbsd openbsd solaris // Functions shared between linux/darwin. package allocdir diff --git a/client/driver/executor/executor_unix.go b/client/driver/executor/executor_unix.go index 07c688084..7c8ddf724 100644 --- a/client/driver/executor/executor_unix.go +++ b/client/driver/executor/executor_unix.go @@ -1,4 +1,4 @@ -// +build !windows +// +build darwin dragonfly freebsd linux netbsd openbsd solaris package executor diff --git a/client/driver/logging/syslog_parser_unix.go b/client/driver/logging/syslog_parser_unix.go index 72d73c43d..3cda8bb2e 100644 --- a/client/driver/logging/syslog_parser_unix.go +++ b/client/driver/logging/syslog_parser_unix.go @@ -1,4 +1,4 @@ -// +build !windows +// +build darwin dragonfly freebsd linux netbsd openbsd solaris package logging diff --git a/client/driver/logging/syslog_parser_unix_test.go b/client/driver/logging/syslog_parser_unix_test.go index 4f1416a1a..aeb1959a8 100644 --- a/client/driver/logging/syslog_parser_unix_test.go +++ b/client/driver/logging/syslog_parser_unix_test.go @@ -1,4 +1,4 @@ -// +build !windows +// +build darwin dragonfly freebsd linux netbsd openbsd solaris package logging diff --git a/client/driver/logging/universal_collector_unix.go b/client/driver/logging/universal_collector_unix.go index 100696816..1db92fce4 100644 --- a/client/driver/logging/universal_collector_unix.go +++ b/client/driver/logging/universal_collector_unix.go @@ -1,4 +1,4 @@ -// +build !windows +// +build darwin dragonfly freebsd linux netbsd openbsd solaris package logging diff --git a/client/driver/utils_unix.go b/client/driver/utils_unix.go index ccaaeee1f..474cdcf17 100644 --- a/client/driver/utils_unix.go +++ b/client/driver/utils_unix.go @@ -1,4 +1,4 @@ -// +build !linux,!windows +// +build darwin dragonfly freebsd linux netbsd openbsd solaris package driver