From ee6019ce5d3bc7e80ab1d8b8d2fbad3351ff778b Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 9 Jan 2018 21:42:59 +0000 Subject: [PATCH] os/signal/internal/pty: build on Solaris Patch from Rainer Orth. Reviewed-on: https://go-review.googlesource.com/87037 From-SVN: r256399 --- gcc/go/gofrontend/MERGE | 2 +- libgo/go/os/signal/internal/pty/pty.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 870348de6ef..043e56021fc 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -29e821cf865aa6ee06cee9dae9823295202b1a61 +cd422bacf0505e9656661d97a571668ad1bde0fe 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/signal/internal/pty/pty.go b/libgo/go/os/signal/internal/pty/pty.go index 4728de71d43..020f7bfc665 100644 --- a/libgo/go/os/signal/internal/pty/pty.go +++ b/libgo/go/os/signal/internal/pty/pty.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 linux,!android netbsd openbsd +// +build darwin dragonfly freebsd linux,!android netbsd openbsd solaris // Package pty is a simple pseudo-terminal package for Unix systems, // implemented by calling C functions via cgo. -- 2.30.2