cmd/dist: force non-devel version for cross-build buildlets

If the compiler has a non-devel version it will report that version
to the go command for use as the "compiler ID" instead of using
the content ID of the binary. This in turn allows the go command
to see the compiled-for-amd64 arm compiler and the compiled-for-arm
arm compiler as having the same ID, so that packages cross-compiled
from amd64 look up-to-date when copied to the arm system
during the linux-arm buildlets and trybots.

Change-Id: I76cbf129303941f8e31bdb100e263478159ddaa5
Reviewed-on: https://go-review.googlesource.com/74360
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>

diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index 2d4b575a834495e8bf474d8a3c25c88e7dc94284..fac9be977754e14d2ee6ea2ce6ac93bee2079ee2 100644 (file)
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -288,6 +288,26 @@ func findgoversion() string {
                // its content if available, which is empty at this point.
                // Only use the VERSION file if it is non-empty.
                if b != "" {
+                       // Some builders cross-compile the toolchain on linux-amd64
+                       // and then copy the toolchain to the target builder (say, linux-arm)
+                       // for use there. But on non-release (devel) branches, the compiler
+                       // used on linux-amd64 will be an amd64 binary, and the compiler
+                       // shipped to linux-arm will be an arm binary, so they will have different
+                       // content IDs (they are binaries for different architectures) and so the
+                       // packages compiled by the running-on-amd64 compiler will appear
+                       // stale relative to the running-on-arm compiler. Avoid this by setting
+                       // the version string to something that doesn't begin with devel.
+                       // Then the version string will be used in place of the content ID,
+                       // and the packages will look up-to-date.
+                       // TODO(rsc): Really the builders could be writing out a better VERSION file instead,
+                       // but it is easier to change cmd/dist than to try to make changes to
+                       // the builder while Brad is away.
+                       if strings.HasPrefix(b, "devel") {
+                               if hostType := os.Getenv("META_BUILDLET_HOST_TYPE"); strings.Contains(hostType, "-cross") {
+                                       fmt.Fprintf(os.Stderr, "warning: changing VERSION from %q to %q\n", b, "builder "+hostType)
+                                       b = "builder " + hostType
+                               }
+                       }
                        return b
                }
        }