@@ -355,26 +355,6 @@ func findgoversion() string {
355
355
// its content if available, which is empty at this point.
356
356
// Only use the VERSION file if it is non-empty.
357
357
if b != "" {
358
- // Some builders cross-compile the toolchain on linux-amd64
359
- // and then copy the toolchain to the target builder (say, linux-arm)
360
- // for use there. But on non-release (devel) branches, the compiler
361
- // used on linux-amd64 will be an amd64 binary, and the compiler
362
- // shipped to linux-arm will be an arm binary, so they will have different
363
- // content IDs (they are binaries for different architectures) and so the
364
- // packages compiled by the running-on-amd64 compiler will appear
365
- // stale relative to the running-on-arm compiler. Avoid this by setting
366
- // the version string to something that doesn't begin with devel.
367
- // Then the version string will be used in place of the content ID,
368
- // and the packages will look up-to-date.
369
- // TODO(rsc): Really the builders could be writing out a better VERSION file instead,
370
- // but it is easier to change cmd/dist than to try to make changes to
371
- // the builder while Brad is away.
372
- if strings .HasPrefix (b , "devel" ) {
373
- if hostType := os .Getenv ("META_BUILDLET_HOST_TYPE" ); strings .Contains (hostType , "-cross" ) {
374
- fmt .Fprintf (os .Stderr , "warning: changing VERSION from %q to %q\n " , b , "builder " + hostType )
375
- b = "builder " + hostType
376
- }
377
- }
378
358
return b
379
359
}
380
360
}
0 commit comments