From 53a36c2652910378a5fcce39cd905643d2df6316 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 29 Aug 2017 21:56:31 +0000 Subject: [PATCH] net/internal/socktest: build sys_unix.go on AIX Reviewed-on: https://go-review.googlesource.com/59913 From-SVN: r251440 --- gcc/go/gofrontend/MERGE | 2 +- libgo/go/net/internal/socktest/sys_unix.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index f1d198ac386..f49be92fbca 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -930304ec98bfe8e9cccb34d340873958e14255df +5674b5927d5336e20fbec455a9f7b0b8ed70166c 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/net/internal/socktest/sys_unix.go b/libgo/go/net/internal/socktest/sys_unix.go index f983e266f16..a3d1282c2a4 100644 --- a/libgo/go/net/internal/socktest/sys_unix.go +++ b/libgo/go/net/internal/socktest/sys_unix.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 nacl netbsd openbsd solaris +// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris package socktest -- 2.30.2