os/signal/internal/pty: build on Solaris

    Patch from Rainer Orth.

    Reviewed-on: https://go-review.googlesource.com/87037

From-SVN: r256399

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 870348de6ef46c12720f9ea8590d3343b7d98846..043e56021fca68ee925be95ca2731db8a5f9b5d0 100644 (file)
--- 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 4728de71d43a2e38ef1e9017b349cfa116ea2bdb..020f7bfc665f9384ba3be39b6f3121f6d59eb225 100644 (file)
--- 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.