mirror of
https://github.com/golang/go
synced 2024-11-23 05:10:09 -07:00
cmd/dist: tolerate macOS writing .DS_Store to GOROOT/bin
I was trying out gorebuild (a program that runs make.bash many times) on a macOS system. Unfortunately there were a few failed invocations on my first try, but not with a very good or interesting reason: go tool dist: unexpected new file in $GOROOT/bin: .DS_Store Tolerate it since it's not unexpected, and will not affect the build. Change-Id: I656536b896098c2ba934667196d4ce82e706c8da Reviewed-on: https://go-review.googlesource.com/c/go/+/513763 Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org> Reviewed-by: Russ Cox <rsc@golang.org> TryBot-Result: Gopher Robot <gobot@golang.org> Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
This commit is contained in:
parent
f32e0c30e4
commit
f719de0798
3
src/cmd/dist/build.go
vendored
3
src/cmd/dist/build.go
vendored
@ -1577,6 +1577,9 @@ func cmdbootstrap() {
|
||||
ok[f] = true
|
||||
}
|
||||
for _, f := range binFiles {
|
||||
if gohostos == "darwin" && filepath.Base(f) == ".DS_Store" {
|
||||
continue // unfortunate but not unexpected
|
||||
}
|
||||
elem := strings.TrimSuffix(filepath.Base(f), ".exe")
|
||||
if !ok[f] && elem != "go" && elem != "gofmt" && elem != goos+"_"+goarch {
|
||||
fatalf("unexpected new file in $GOROOT/bin: %s", elem)
|
||||
|
Loading…
Reference in New Issue
Block a user