diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go
index c4e366024cb3d8..1a33a45b232122 100644
--- a/src/cmd/dist/buildtool.go
+++ b/src/cmd/dist/buildtool.go
@@ -213,6 +213,9 @@ func bootstrapBuildTools() {
 	if tool := os.Getenv("GOBOOTSTRAP_TOOLEXEC"); tool != "" {
 		cmd = append(cmd, "-toolexec="+tool)
 	}
+	if !isGitRepo() {
+		cmd = append(cmd, "-buildvcs=false")
+	}
 	cmd = append(cmd, "bootstrap/cmd/...")
 	run(base, ShowOutput|CheckExit, cmd...)