From c807800ba210ea60697f10e98aae843d644794e6 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Thu, 8 Dec 2022 09:26:46 +0100 Subject: [PATCH] lib/fs: Watching is unsupported on android/amd64 (fixes #8709) --- lib/fs/basicfs_watch.go | 6 ++++-- lib/fs/basicfs_watch_unsupported.go | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/fs/basicfs_watch.go b/lib/fs/basicfs_watch.go index d26f83ed03b..83aea94e785 100644 --- a/lib/fs/basicfs_watch.go +++ b/lib/fs/basicfs_watch.go @@ -4,8 +4,10 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at http://mozilla.org/MPL/2.0/. -//go:build (!solaris && !darwin) || (solaris && cgo) || (darwin && cgo) -// +build !solaris,!darwin solaris,cgo darwin,cgo +//go:build !(solaris && !cgo) && !(darwin && !cgo) && !(android && amd64) +// +build !solaris cgo +// +build !darwin cgo +// +build !android !amd64 package fs diff --git a/lib/fs/basicfs_watch_unsupported.go b/lib/fs/basicfs_watch_unsupported.go index 753eb68137c..fa4ab80da90 100644 --- a/lib/fs/basicfs_watch_unsupported.go +++ b/lib/fs/basicfs_watch_unsupported.go @@ -4,8 +4,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // You can obtain one at http://mozilla.org/MPL/2.0/. -//go:build (solaris && !cgo) || (darwin && !cgo) -// +build solaris,!cgo darwin,!cgo +//go:build (solaris && !cgo) || (darwin && !cgo) || (android && amd64) +// +build solaris,!cgo darwin,!cgo android,amd64 package fs