From dfbadb8ce9f4a7278121ab92bf77bde0c1d3b641 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 28 Oct 2020 11:48:19 -0700 Subject: [PATCH] syscall: don't build libcall_bsd.go on solaris This new file was based on master sources that are built for *BSD but not Solaris Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/266017 --- gcc/go/gofrontend/MERGE | 2 +- libgo/go/syscall/libcall_bsd.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 1f65809fc81..45aafaab5c5 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -be0d2cc2df9f98d967c242594838f86362dae2e7 +88a25df9133e9a1fc28a00b08ee30d7e5ab2cdbb 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/syscall/libcall_bsd.go b/libgo/go/syscall/libcall_bsd.go index f13d3bcbe16..1dd957c4531 100644 --- a/libgo/go/syscall/libcall_bsd.go +++ b/libgo/go/syscall/libcall_bsd.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build darwin dragonfly freebsd netbsd openbsd solaris +// +build darwin dragonfly freebsd netbsd openbsd // BSD library calls. -- 2.30.2