From 952ecbe0a27aadd184ca3e2c342beb464d6b1653 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 14 Jun 2017 21:32:41 +0000 Subject: cmd/go: disable tool version check during bootstrap The check that the go tool version matched the go compiler version was too aggressive and didn't cover the bootstrapping case with make.bash. We never noticed because we never had a VERSION file in place. Repro: $ echo "go1.9beta1" > $GOROOT/VERSION $ cd $GOROOT/src $ ./make.bash No test, because x/build/cmd/release catches it. Updates #19064 Fixes #20674 Change-Id: Ibdd7a92377f4cc77d71ed548f02d48bde6550f67 Reviewed-on: https://go-review.googlesource.com/45778 Reviewed-by: Chris Broadfoot --- src/cmd/go/internal/work/build.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go index 413537d9de..20f3952d4a 100644 --- a/src/cmd/go/internal/work/build.go +++ b/src/cmd/go/internal/work/build.go @@ -396,7 +396,7 @@ func BuildModeInit() { cfg.BuildContext.InstallSuffix += codegenArg[1:] } } - if strings.HasPrefix(runtimeVersion, "go1") { + if strings.HasPrefix(runtimeVersion, "go1") && !strings.Contains(os.Args[0], "go_bootstrap") { buildGcflags = append(buildGcflags, "-goversion", runtimeVersion) } } -- cgit v1.2.3-54-g00ecf