From 4d581e05a3acc783fe92debc804ee3790c3d7c0c Mon Sep 17 00:00:00 2001 From: Mikio Hara Date: Sat, 7 Jul 2018 03:15:23 +0900 Subject: [PATCH] all: re-adjust build constraints for JS and NaCl This change fixes the build breakage of h2i on JS and NaCl, and avoids using unintentional code path on JS. Change-Id: Ib08f0f6d1d79aecc9bf1e9ee7de52b0a57c22baf Reviewed-on: https://go-review.googlesource.com/122539 Run-TryBot: Mikio Hara Reviewed-by: Brad Fitzpatrick TryBot-Result: Gobot Gobot --- http2/h2i/h2i.go | 2 +- internal/nettest/helper_stub.go | 2 +- ipv4/payload_cmsg.go | 2 +- ipv4/payload_cmsg_go1_8.go | 2 +- ipv4/payload_cmsg_go1_9.go | 2 +- ipv4/payload_nocmsg.go | 2 +- ipv6/payload_cmsg.go | 2 +- ipv6/payload_cmsg_go1_8.go | 2 +- ipv6/payload_cmsg_go1_9.go | 2 +- ipv6/payload_nocmsg.go | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/http2/h2i/h2i.go b/http2/h2i/h2i.go index 62e57527..12d325eb 100644 --- a/http2/h2i/h2i.go +++ b/http2/h2i/h2i.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 !plan9,!solaris +// +build !js,!nacl,!plan9,!solaris /* The h2i command is an interactive HTTP/2 console. diff --git a/internal/nettest/helper_stub.go b/internal/nettest/helper_stub.go index d729156d..d89cf299 100644 --- a/internal/nettest/helper_stub.go +++ b/internal/nettest/helper_stub.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 js,wasm nacl plan9 +// +build js nacl plan9 package nettest diff --git a/ipv4/payload_cmsg.go b/ipv4/payload_cmsg.go index eec520c4..204a49fe 100644 --- a/ipv4/payload_cmsg.go +++ b/ipv4/payload_cmsg.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 !nacl,!plan9,!windows +// +build !js,!nacl,!plan9,!windows package ipv4 diff --git a/ipv4/payload_cmsg_go1_8.go b/ipv4/payload_cmsg_go1_8.go index d26ccd90..8d45599f 100644 --- a/ipv4/payload_cmsg_go1_8.go +++ b/ipv4/payload_cmsg_go1_8.go @@ -3,7 +3,7 @@ // license that can be found in the LICENSE file. // +build !go1.9 -// +build !nacl,!plan9,!windows +// +build !js,!nacl,!plan9,!windows package ipv4 diff --git a/ipv4/payload_cmsg_go1_9.go b/ipv4/payload_cmsg_go1_9.go index 2f193118..4081aad8 100644 --- a/ipv4/payload_cmsg_go1_9.go +++ b/ipv4/payload_cmsg_go1_9.go @@ -3,7 +3,7 @@ // license that can be found in the LICENSE file. // +build go1.9 -// +build !nacl,!plan9,!windows +// +build !js,!nacl,!plan9,!windows package ipv4 diff --git a/ipv4/payload_nocmsg.go b/ipv4/payload_nocmsg.go index 8cb21b39..1d434c61 100644 --- a/ipv4/payload_nocmsg.go +++ b/ipv4/payload_nocmsg.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 nacl plan9 windows +// +build js nacl plan9 windows package ipv4 diff --git a/ipv6/payload_cmsg.go b/ipv6/payload_cmsg.go index b7ccdbda..3f23b5d2 100644 --- a/ipv6/payload_cmsg.go +++ b/ipv6/payload_cmsg.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 !nacl,!plan9,!windows +// +build !js,!nacl,!plan9,!windows package ipv6 diff --git a/ipv6/payload_cmsg_go1_8.go b/ipv6/payload_cmsg_go1_8.go index fdc6c399..bc4209db 100644 --- a/ipv6/payload_cmsg_go1_8.go +++ b/ipv6/payload_cmsg_go1_8.go @@ -3,7 +3,7 @@ // license that can be found in the LICENSE file. // +build !go1.9 -// +build !nacl,!plan9,!windows +// +build !js,!nacl,!plan9,!windows package ipv6 diff --git a/ipv6/payload_cmsg_go1_9.go b/ipv6/payload_cmsg_go1_9.go index 8f6d02e2..7dd65048 100644 --- a/ipv6/payload_cmsg_go1_9.go +++ b/ipv6/payload_cmsg_go1_9.go @@ -3,7 +3,7 @@ // license that can be found in the LICENSE file. // +build go1.9 -// +build !nacl,!plan9,!windows +// +build !js,!nacl,!plan9,!windows package ipv6 diff --git a/ipv6/payload_nocmsg.go b/ipv6/payload_nocmsg.go index 83585072..459142d2 100644 --- a/ipv6/payload_nocmsg.go +++ b/ipv6/payload_nocmsg.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 nacl plan9 windows +// +build js nacl plan9 windows package ipv6