From 3d0fa95d5c3c8826c9bc5ce746b220aa36581afb Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 11 Aug 2016 21:36:13 +0000 Subject: [PATCH] os: fix build tags for dir_regfile.go We want to build dir_regfile.go if not GNU/linux, and not solaris/386, and not solaris/sparc. The latter two conditions were incorrect. To write ! solaris/386 we have to write !solaris !386. I forgot De Morgan's Law. Reviewed-on: https://go-review.googlesource.com/26870 From-SVN: r239393 --- gcc/go/gofrontend/MERGE | 2 +- libgo/go/os/dir_regfile.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 68e414b4e8b..1ebefe6b020 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -5e05b7bc947231b4d5a8327bf63e2fa648e51dc7 +fe1e77f843220503f1f8d5ea7dd5e307580e1d38 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/os/dir_regfile.go b/libgo/go/os/dir_regfile.go index adea87d5430..8b17f387f1c 100644 --- a/libgo/go/os/dir_regfile.go +++ b/libgo/go/os/dir_regfile.go @@ -6,8 +6,8 @@ // license that can be found in the LICENSE file. // +build !linux -// +build !solaris,386 -// +build !solaris,sparc +// +build !solaris !386 +// +build !solaris !sparc package os -- 2.30.2