bootstrap.bash: remove exec wrappers

Without this change, building an Android toolchain fails:

$ CGO_ENABLED=1 GOARCH=arm64 GOOS=android ./bootstrap.bash
...
rmdir: failed to remove 'bin/go_android_arm64_exec': Not a directory

Change-Id: Ibc3b1e2fd24b73a63bd3020ce1e813f2b4496125
Reviewed-on: https://go-review.googlesource.com/c/go/+/170941
Run-TryBot: Elias Naur <mail@eliasnaur.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/bootstrap.bash b/src/bootstrap.bash
index 32b736ad7885e7547e1abb74354ea4c90c525aa3..673fb61c67e9bec918a4e190570eb312e599d386 100755 (executable)
--- a/src/bootstrap.bash
+++ b/src/bootstrap.bash
@@ -72,6 +72,7 @@ if [ "$goos" = "$gohostos" -a "$goarch" = "$gohostarch" ]; then
        # prepare a clean toolchain for others.
        true
 else
+       rm bin/go_${goos}_${goarch}_exec
        mv bin/*_*/* bin
        rmdir bin/*_*
        rm -rf "pkg/${gohostos}_${gohostarch}" "pkg/tool/${gohostos}_${gohostarch}"