On Thu, Jul 18, 2013 at 6:59 AM, Rainer Orth <r...@cebitec.uni-bielefeld.de> wrote: > Ian Lance Taylor <i...@google.com> writes: > >> I have committed a large patch to update libgo to the library that was >> part of the Go 1.1.1 release. As usual, I'm not including the entire >> patch in this e-mail message, because it is too large. I'm only >> including the changes to the files that are partially gccgo-specific. >> Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. >> Committed to mainline and 4.8 branch. > > This broke the Solaris build: > > /vol/gcc/src/hg/trunk/local/libgo/go/net/sock_solaris.go:20:1: error: > redefinition of 'listenerSockaddr' > func listenerSockaddr(s, f int, la syscall.Sockaddr, toAddr > func(syscall.Sockaddr) Addr) (syscall.Sockaddr, error) { > ^ > /vol/gcc/src/hg/trunk/local/libgo/go/net/sock_unix.go:11:1: note: previous > definition of 'listenerSockaddr' was here > func listenerSockaddr(s, f int, la syscall.Sockaddr, toAddr > func(syscall.Sockaddr) Addr) (syscall.Sockaddr, error) { > ^ > make[2]: *** [net.lo] Error 1 > > Seems enought to just remove the sock_solaris.go definition.
I agree. I committed this patch to mainline and 4.8 branch. Thanks for reporting the problem. Ian
foo.patch
Description: Binary data