[dev.cc] all: merge master (5f1efe7) into dev.cc

[gostls13.git] / src / cmd / dist / buildruntime.go

diff --git a/src/cmd/dist/buildruntime.go b/src/cmd/dist/buildruntime.go
index ff2a489b5594642d26587d09047d7999829ec6fb..1f8276468e1d706d5e520ea86acf87948e0e53e9 100644 (file)
--- a/src/cmd/dist/buildruntime.go
+++ b/src/cmd/dist/buildruntime.go
@@ -28,7 +28,7 @@ func mkzversion(dir, file string) {
                        "const defaultGoroot = `%s`\n"+
                        "const theVersion = `%s`\n"+
                        "const goexperiment = `%s`\n"+
-                       "var buildVersion = theVersion\n", goroot_final, goversion, os.Getenv("GOEXPERIMENT"))
+                       "var buildVersion = theVersion\n", goroot_final, findgoversion(), os.Getenv("GOEXPERIMENT"))
 
        writefile(out, file, 0)
 }
@@ -56,7 +56,7 @@ func mkzbootstrap(file string) {
                        "const defaultGOARCH = `%s`\n"+
                        "const version = `%s`\n"+
                        "const goexperiment = `%s`\n",
-               goroot_final, goarm, gohostos, gohostarch, goversion, os.Getenv("GOEXPERIMENT"))
+               goroot_final, goarm, gohostos, gohostarch, findgoversion(), os.Getenv("GOEXPERIMENT"))
 
        writefile(out, file, 0)
 }