From 3b1faeda9afbcba128c2d794b38ffe7982141139 Mon Sep 17 00:00:00 2001 From: Andrew Bonventre Date: Fri, 1 Sep 2017 11:45:22 -0400 Subject: [PATCH] imports: fix +build tags to exclude syscall deps on appengine The following tag // +build linux,!appengine darwin Translated to (linux AND !appengine) OR (darwin) Causing issues on darwin when attempting to run dev_appserver. Change this to always exclude these files from appengine builds. Change-Id: Ifd63a884747001797d0b0e828f0c9c391bc7c73c Reviewed-on: https://go-review.googlesource.com/60911 Reviewed-by: Ian Lance Taylor Reviewed-by: Chris Broadfoot --- imports/fastwalk_dirent_ino.go | 3 ++- imports/fastwalk_unix.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/imports/fastwalk_dirent_ino.go b/imports/fastwalk_dirent_ino.go index ee85bc4d..9fc6de03 100644 --- a/imports/fastwalk_dirent_ino.go +++ b/imports/fastwalk_dirent_ino.go @@ -2,7 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build linux,!appengine darwin +// +build linux darwin +// +build !appengine package imports diff --git a/imports/fastwalk_unix.go b/imports/fastwalk_unix.go index 5854233d..db6ee8da 100644 --- a/imports/fastwalk_unix.go +++ b/imports/fastwalk_unix.go @@ -2,7 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build linux,!appengine darwin freebsd openbsd netbsd +// +build linux darwin freebsd openbsd netbsd +// +build !appengine package imports