qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 06:54:49 -07:00
Code Releases Activity

cmd/go: change error message to refer to correct bootstrap command

Browse Source 
R=golang-dev, r
CC=golang-dev
https://golang.org/cl/12317043
This commit is contained in:
Alex Brainman 2013-08-02 15:55:21 +10:00
parent 97863bb8af
commit 6f8acd5fb9
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cmd/go/build.go
View File

@ -772,7 +772,7 @@ func (b *builder) build(a *action) (err error) {
if a.p.Standard && a.p.ImportPath == "runtime" && buildContext.Compiler == "gc" && if a.p.Standard && a.p.ImportPath == "runtime" && buildContext.Compiler == "gc" &&
!hasString(a.p.HFiles, "zasm_"+buildContext.GOOS+"_"+buildContext.GOARCH+".h") { !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. // Make build directory.
@ -2242,3 +2242,16 @@ func raceInit() {
buildContext.InstallSuffix += "race" buildContext.InstallSuffix += "race"
buildContext.BuildTags = append(buildContext.BuildTags, "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"
}
}