From: Cherry Mui <cherryyz@google.com>
Date: Fri, 18 Nov 2022 02:12:25 +0000 (-0500)
Subject: cmd/dist: stop trying to access runtime/internal/sys.a in debug mode
X-Git-Tag: go1.20rc1~127
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=199d77aff0372daac2db39d7fb2da16269e4ffd4;p=gostls13.git

cmd/dist: stop trying to access runtime/internal/sys.a in debug mode

Now that we don't install the .a files, the installed
runtime/internal/sys.a no longer exists. Stop trying to access it.

Change-Id: Ic437e7ad95be6109d0b2fcfb81e840f5cb476be8
Reviewed-on: https://go-review.googlesource.com/c/go/+/451360
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Michael Matloob <matloob@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
Run-TryBot: Cherry Mui <cherryyz@google.com>
---

diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index d0b71f1e57..2662f80780 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -1378,7 +1378,6 @@ func cmdbootstrap() {
 	goInstall(goBootstrap, toolchain...)
 	if debug {
 		run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")
-		run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch))
 		copyfile(pathf("%s/compile2", tooldir), pathf("%s/compile", tooldir), writeExec)
 	}
 
@@ -1406,7 +1405,6 @@ func cmdbootstrap() {
 	goInstall(goBootstrap, append([]string{"-a"}, toolchain...)...)
 	if debug {
 		run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")
-		run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch))
 		copyfile(pathf("%s/compile3", tooldir), pathf("%s/compile", tooldir), writeExec)
 	}
 
@@ -1448,7 +1446,6 @@ func cmdbootstrap() {
 	checkNotStale(cmdGo, targets...)
 	if debug {
 		run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")
-		run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch))
 		checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)
 		copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec)
 	}