From 6f8acd5fb93f26f59739343d945c6e26021cce57 Mon Sep 17 00:00:00 2001 From: Alex Brainman Date: Fri, 2 Aug 2013 15:55:21 +1000 Subject: [PATCH] cmd/go: change error message to refer to correct bootstrap command R=golang-dev, r CC=golang-dev https://golang.org/cl/12317043 --- src/cmd/go/build.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go index 0c9e561538..f43063290a 100644 --- a/src/cmd/go/build.go +++ b/src/cmd/go/build.go @@ -772,7 +772,7 @@ func (b *builder) build(a *action) (err error) { if a.p.Standard && a.p.ImportPath == "runtime" && buildContext.Compiler == "gc" && !hasString(a.p.HFiles, "zasm_"+buildContext.GOOS+"_"+buildContext.GOARCH+".h") { - return fmt.Errorf("%s/%s must be bootstrapped using make.bash", buildContext.GOOS, buildContext.GOARCH) + return fmt.Errorf("%s/%s must be bootstrapped using make%v", buildContext.GOOS, buildContext.GOARCH, defaultSuffix()) } // Make build directory. @@ -2242,3 +2242,16 @@ func raceInit() { buildContext.InstallSuffix += "race" buildContext.BuildTags = append(buildContext.BuildTags, "race") } + +// defaultSuffix returns file extension used for command files in +// current os environment. +func defaultSuffix() string { + switch runtime.GOOS { + case "windows": + return ".bat" + case "plan9": + return ".rc" + default: + return ".bash" + } +} -- 2.48.1