From: Adam Langley <agl@golang.org>
Date: Mon, 29 Sep 2014 19:23:43 +0000 (-0700)
Subject: go/build: add go1.4 tag.
X-Git-Tag: go1.4beta1~258
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=bd72d2c650d0b7b668a8b3de58e60b8b61278956;p=gostls13.git

go/build: add go1.4 tag.

LGTM=bradfitz
R=bradfitz
CC=golang-codereviews
https://golang.org/cl/138000044
---

diff --git a/src/go/build/build.go b/src/go/build/build.go
index 69cb4b2f6b..5e11c9b9c5 100644
--- a/src/go/build/build.go
+++ b/src/go/build/build.go
@@ -294,10 +294,10 @@ func defaultContext() Context {
 	// say "+build go1.x", and code that should only be built before Go 1.x
 	// (perhaps it is the stub to use in that case) should say "+build !go1.x".
 	//
-	// When we reach Go 1.4 the line will read
-	//	c.ReleaseTags = []string{"go1.1", "go1.2", "go1.3", "go1.4"}
+	// When we reach Go 1.5 the line will read
+	//	c.ReleaseTags = []string{"go1.1", "go1.2", "go1.3", "go1.4", "go1.5"}
 	// and so on.
-	c.ReleaseTags = []string{"go1.1", "go1.2", "go1.3"}
+	c.ReleaseTags = []string{"go1.1", "go1.2", "go1.3", "go1.4"}
 
 	switch os.Getenv("CGO_ENABLED") {
 	case "1":
diff --git a/src/go/build/doc.go b/src/go/build/doc.go
index d78ef3f1c8..56878f2b4a 100644
--- a/src/go/build/doc.go
+++ b/src/go/build/doc.go
@@ -100,6 +100,7 @@
 //	- "go1.1", from Go version 1.1 onward
 //	- "go1.2", from Go version 1.2 onward
 //	- "go1.3", from Go version 1.3 onward
+//	- "go1.4", from Go version 1.4 onward
 //	- any additional words listed in ctxt.BuildTags
 //
 // If a file's name, after stripping the extension and a possible _test suffix,