From 0838c0f2f9fd45f527c4be8e27589eed22e0e559 Mon Sep 17 00:00:00 2001
From: Cherry Zhang <cherryyz@google.com>
Date: Mon, 6 Nov 2017 12:40:49 -0500
Subject: [PATCH] cmd/dist: include "cmd/buildid" in toolchain in debug mode

Fixes #22599.

Change-Id: I2d59a8fae457881f681184fc6ed1f2aa597699b3
Reviewed-on: https://go-review.googlesource.com/76026
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
---
 src/cmd/dist/build.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index 107990ea47..675989ea9f 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -1118,6 +1118,11 @@ func cmdbootstrap() {
 
 	xflagparse(0)
 
+	if debug {
+		// cmd/buildid is used in debug mode.
+		toolchain = append(toolchain, "cmd/buildid")
+	}
+
 	if isdir(pathf("%s/src/pkg", goroot)) {
 		fatalf("\n\n"+
 			"The Go package sources have moved to $GOROOT/src.\n"+
-- 
2.48.1