net: remove the dreg of solaris merge

Also enables netgo test on solaris.

LGTM=aram, jsing
R=golang-codereviews, dave, aram, jsing
CC=golang-codereviews
https://golang.org/cl/70300043
This commit is contained in:
Mikio Hara 2014-03-03 07:09:28 +09:00
parent d9fc789df2
commit f706d707b7
2 changed files with 2 additions and 2 deletions

View File

@ -3,7 +3,7 @@
// license that can be found in the LICENSE file.
// +build !netgo
// +build darwin dragonfly freebsd linux netbsd openbsd solaris
// +build darwin dragonfly freebsd linux netbsd openbsd
package net

View File

@ -3,7 +3,7 @@
// license that can be found in the LICENSE file.
// +build !cgo netgo
// +build darwin dragonfly freebsd linux netbsd openbsd
// +build darwin dragonfly freebsd linux netbsd openbsd solaris
package net