From 1cff98d4fe3a39356b697225ff27ba5e2f1ef217 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sun, 7 Apr 2019 15:11:39 +0200 Subject: [PATCH] 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 TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- src/bootstrap.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bootstrap.bash b/src/bootstrap.bash index 32b736ad78..673fb61c67 100755 --- 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}" -- 2.48.1