From df1cdbf7933ae03d716e4ce657f15d8e77309da5 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 12 Apr 2019 14:20:21 +0200 Subject: [PATCH] bootstrap.bash: fix build if no exec wrapper exists Since CL 170941 bootstrap.bash fails if no exec wrapper exists for a given GOOS/GOARCH yet: #### Building ../../go-linux-arm-bootstrap Building Go cmd/dist using /usr/local/go. Building Go toolchain1 using /usr/local/go. Building Go bootstrap cmd/go (go_bootstrap) using Go toolchain1. Building Go toolchain2 using go_bootstrap and Go toolchain1. Building Go toolchain3 using go_bootstrap and Go toolchain2. Building packages and commands for host, linux/amd64. Building packages and commands for target, linux/arm. rm: cannot remove 'bin/go_linux_arm_exec': No such file or directory Fix it by using 'rm -f' to ignore nonexisting files. Change-Id: Ib4b1e19747052fa4dca06319f35cc25a0545c4f7 Reviewed-on: https://go-review.googlesource.com/c/go/+/171722 Run-TryBot: Tobias Klauser TryBot-Result: Gobot Gobot Reviewed-by: Elias Naur --- src/bootstrap.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap.bash b/src/bootstrap.bash index 673fb61c67..bc9d445345 100755 --- a/src/bootstrap.bash +++ b/src/bootstrap.bash @@ -72,7 +72,7 @@ if [ "$goos" = "$gohostos" -a "$goarch" = "$gohostarch" ]; then # prepare a clean toolchain for others. true else - rm bin/go_${goos}_${goarch}_exec + rm -f bin/go_${goos}_${goarch}_exec mv bin/*_*/* bin rmdir bin/*_* rm -rf "pkg/${gohostos}_${gohostarch}" "pkg/tool/${gohostos}_${gohostarch}" -- 2.48.1