From f4d2d71752474aed3f35b42ac77175e970da76ab Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 21 Jan 2015 12:10:35 -0500 Subject: [PATCH] [dev.cc] cmd/dist: build new5a etc during bootstrap The change to the bootstrap import conversion is for the a.y files, which use import dot. While we're editing the tool list, add "cmd/dist". Right now 'go install cmd/dist' installs to $GOROOT/bin/dist. (A new bug since cmd/dist has been rewritten in Go. When cmd/dist was a C program, go install cmd/dist just didn't work.) Change-Id: I362208dcfb4ae64c987f60b95dc946829fa506d8 Reviewed-on: https://go-review.googlesource.com/3144 Reviewed-by: Ian Lance Taylor Reviewed-by: Rob Pike --- src/cmd/dist/buildtool.go | 8 +++++++- src/cmd/go/pkg.go | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go index 10371526d3..6cfe4c78b5 100644 --- a/src/cmd/dist/buildtool.go +++ b/src/cmd/dist/buildtool.go @@ -23,11 +23,16 @@ import ( // which are commands, and entries beginning with internal/, which are // packages supporting the commands. var bootstrapDirs = []string{ + "internal/asm", "internal/obj", "internal/obj/arm", "internal/obj/i386", "internal/obj/ppc64", "internal/obj/x86", + "new5a", + "new6a", + "new8a", + "new9a", "objwriter", } @@ -112,7 +117,8 @@ func bootstrapFixImports(text, srcFile string) string { inBlock = false continue } - if strings.HasPrefix(line, "import \"") || inBlock && strings.HasPrefix(line, "\t\"") { + if strings.HasPrefix(line, `import "`) || strings.HasPrefix(line, `import . "`) || + inBlock && (strings.HasPrefix(line, "\t\"") || strings.HasPrefix(line, "\t. \"")) { lines[i] = strings.Replace(line, `"cmd/internal/`, `"bootstrap/internal/`, -1) } } diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go index e224eef091..9e0f1f6c6c 100644 --- a/src/cmd/go/pkg.go +++ b/src/cmd/go/pkg.go @@ -394,6 +394,7 @@ var goTools = map[string]targetDir{ "cmd/addr2line": toTool, "cmd/api": toTool, "cmd/cgo": toTool, + "cmd/dist": toTool, "cmd/fix": toTool, "cmd/link": toTool, "cmd/new5a": toTool, -- 2.48.1