--- src/cmd/dist/build.go.old	2021-01-24 14:30:24.000000000 +0100
+++ src/cmd/dist/build.go	2021-01-24 14:36:48.000000000 +0100
@@ -1404,7 +1404,7 @@ func cmdbootstrap() {
 		// Skip the cmd tools for js/wasm. They're not usable.
 		targets = targets[:1]
 	}
-	goInstall(goBootstrap, targets...)
+	goInstall(goBootstrap, append([]string{"-p=1", "-x"}, targets...)...)
 	checkNotStale(goBootstrap, targets...)
 	checkNotStale(cmdGo, targets...)
 	if debug {
