summaryrefslogtreecommitdiff
path: root/src/go
diff options
context:
space:
mode:
authorAdam Langley <agl@golang.org>2014-09-29 12:23:43 -0700
committerAdam Langley <agl@golang.org>2014-09-29 12:23:43 -0700
commit9a0bfb277e57fa5493e1745d417424c6d4149f0b (patch)
treec8f51bb3929d65a56e2d3ae9a7e0c0cf778109e4 /src/go
parent305a806914b2a58f55a312e01c9039f39ebb22c0 (diff)
downloadgo-9a0bfb277e57fa5493e1745d417424c6d4149f0b.tar.gz
go/build: add go1.4 tag.
LGTM=bradfitz R=bradfitz CC=golang-codereviews https://codereview.appspot.com/138000044
Diffstat (limited to 'src/go')
-rw-r--r--src/go/build/build.go6
-rw-r--r--src/go/build/doc.go1
2 files changed, 4 insertions, 3 deletions
diff --git a/src/go/build/build.go b/src/go/build/build.go
index 69cb4b2f6..5e11c9b9c 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 d78ef3f1c..56878f2b4 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,