build: fix again

The new cross-compiling bin target was breaking
everything but the system where buildscript.sh ran.

TBR=golang-dev
CC=golang-dev
https://golang.org/cl/5598055

diff --git a/src/buildscript.sh b/src/buildscript.sh
index c95ce78c2cf4301f09cd6946a09b8df22f0e3887..541fdccec532f4c15b666df88a4ed8fdb40026f1 100755 (executable)
--- a/src/buildscript.sh
+++ b/src/buildscript.sh
@@ -30,10 +30,11 @@ set -e
        # as a shell escape but also makes sure that we generate the
        # same scripts on Unix and Windows systems.
        go install -a -n -t cmd_go_bootstrap cmd/go | sed '
+               s;\\;/;g
+               s;\$GOBIN/[a-z0-9]*_[a-z0-9]*/;\$GOBIN/;g
                s/\$GOBIN/"$GOBIN"/g
                s/\$GOROOT/"$GOROOT"/g
                s/\$WORK/"$WORK"/g
-               s;\\;/;g
                s;"\$GOBIN"/go;&_bootstrap;g
                s/go_bootstrap-tool/go-tool/g
                s;"\$GOBIN"/go-tool;"$GOROOT"/bin/go-tool;g

diff --git a/src/buildscript/darwin_386.sh b/src/buildscript/darwin_386.sh
index d434ef500a0b4f90aa32f98fa77c791a14d3856e..91e0d2c38590e357f94344363dfd96902bbf03ae 100755 (executable)
--- a/src/buildscript/darwin_386.sh
+++ b/src/buildscript/darwin_386.sh
@@ -494,5 +494,5 @@ cd "$GOROOT"/src/cmd/go
 "$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 "$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/darwin_386/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/darwin_386/go
+mkdir -p "$GOBIN"/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

diff --git a/src/buildscript/freebsd_386.sh b/src/buildscript/freebsd_386.sh
index f8cdb394d8174935f88c077d573b6f30d5b1fe21..ebac228ce32f1408db838d1384c2da27000c743c 100755 (executable)
--- a/src/buildscript/freebsd_386.sh
+++ b/src/buildscript/freebsd_386.sh
@@ -494,5 +494,5 @@ cd "$GOROOT"/src/cmd/go
 "$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 "$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/freebsd_386/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/freebsd_386/go
+mkdir -p "$GOBIN"/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

diff --git a/src/buildscript/freebsd_amd64.sh b/src/buildscript/freebsd_amd64.sh
index 22e944eec0dad0bfd5a18d55b79ef5e588c526b1..9adbd9f76841ae46185b25a75423893c0819308c 100755 (executable)
--- a/src/buildscript/freebsd_amd64.sh
+++ b/src/buildscript/freebsd_amd64.sh
@@ -493,5 +493,5 @@ cd "$GOROOT"/src/cmd/go
 "$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 "$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/freebsd_amd64/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/freebsd_amd64/go
+mkdir -p "$GOBIN"/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

diff --git a/src/buildscript/linux_386.sh b/src/buildscript/linux_386.sh
index 18e0051f55f78ad688bc237089d366248a84b288..a342b6f7fc361f7a886b7747a10cacf6d7f1dda0 100755 (executable)
--- a/src/buildscript/linux_386.sh
+++ b/src/buildscript/linux_386.sh
@@ -494,5 +494,5 @@ cd "$GOROOT"/src/cmd/go
 "$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 "$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/linux_386/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/linux_386/go
+mkdir -p "$GOBIN"/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

diff --git a/src/buildscript/linux_amd64.sh b/src/buildscript/linux_amd64.sh
index 93c846d9c7549c012d576b6cdc98c5b483b1636d..201b0067e689f64ffebb4f94a0a1c1b9f857ca83 100755 (executable)
--- a/src/buildscript/linux_amd64.sh
+++ b/src/buildscript/linux_amd64.sh
@@ -493,5 +493,5 @@ cd "$GOROOT"/src/cmd/go
 "$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 "$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/linux_amd64/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/linux_amd64/go
+mkdir -p "$GOBIN"/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

diff --git a/src/buildscript/linux_arm.sh b/src/buildscript/linux_arm.sh
index 78ba5bf7745ea8143e618c31b6197dfd3e8a0e21..3caf8af3284d058e9eb42bda33d286f0c54ad051 100755 (executable)
--- a/src/buildscript/linux_arm.sh
+++ b/src/buildscript/linux_arm.sh
@@ -497,5 +497,5 @@ cd "$GOROOT"/src/cmd/go
 "$GOROOT"/bin/go-tool/5g -o "$WORK"/cmd/go/_obj/_go_.5 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.5
 "$GOROOT"/bin/go-tool/5l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/linux_arm/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/linux_arm/go
+mkdir -p "$GOBIN"/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

diff --git a/src/buildscript/netbsd_386.sh b/src/buildscript/netbsd_386.sh
index 1712898c49e231dc70670e30d835b6a3c55ef459..fec31de366278f8ee0cccc5f7ce9f65f1ff91a0d 100755 (executable)
--- a/src/buildscript/netbsd_386.sh
+++ b/src/buildscript/netbsd_386.sh
@@ -494,5 +494,5 @@ cd "$GOROOT"/src/cmd/go
 "$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 "$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/netbsd_386/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/netbsd_386/go
+mkdir -p "$GOBIN"/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

diff --git a/src/buildscript/netbsd_amd64.sh b/src/buildscript/netbsd_amd64.sh
index b00ea35d8119cb84b68189a1bc997dbbe32dffe9..f47e5cca649886aacb327612c455649ec4f8fe18 100755 (executable)
--- a/src/buildscript/netbsd_amd64.sh
+++ b/src/buildscript/netbsd_amd64.sh
@@ -493,5 +493,5 @@ cd "$GOROOT"/src/cmd/go
 "$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 "$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/netbsd_amd64/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/netbsd_amd64/go
+mkdir -p "$GOBIN"/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

diff --git a/src/buildscript/openbsd_386.sh b/src/buildscript/openbsd_386.sh
index 52e53730a8ea3089517c3bcdb2c336b6d8c61b71..b3a0a61365ce78a13a0f86fd58004f0e39e6de5f 100755 (executable)
--- a/src/buildscript/openbsd_386.sh
+++ b/src/buildscript/openbsd_386.sh
@@ -494,5 +494,5 @@ cd "$GOROOT"/src/cmd/go
 "$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 "$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/openbsd_386/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/openbsd_386/go
+mkdir -p "$GOBIN"/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

diff --git a/src/buildscript/openbsd_amd64.sh b/src/buildscript/openbsd_amd64.sh
index 9c353202a5a6de778feba975d4bf697c2316e728..c61f08ae66b58df969ee7444706496a6d42762bf 100755 (executable)
--- a/src/buildscript/openbsd_amd64.sh
+++ b/src/buildscript/openbsd_amd64.sh
@@ -493,5 +493,5 @@ cd "$GOROOT"/src/cmd/go
 "$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 "$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/openbsd_amd64/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/openbsd_amd64/go
+mkdir -p "$GOBIN"/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

diff --git a/src/buildscript/plan9_386.sh b/src/buildscript/plan9_386.sh
index 725a2a431b0c3982c8859d83d8a0e4bf4c8a846a..c9548b0a9409197b1549b40230d272ff12c066f3 100755 (executable)
--- a/src/buildscript/plan9_386.sh
+++ b/src/buildscript/plan9_386.sh
@@ -494,5 +494,5 @@ cd "$GOROOT"/src/cmd/go
 "$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 "$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/plan9_386/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/plan9_386/go
+mkdir -p "$GOBIN"/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap

diff --git a/src/buildscript/windows_386.sh b/src/buildscript/windows_386.sh
index 3c21c32322d25fd434554ebbfd58ce22f948137b..5b85a1c1e45a9664b40661cded2dd49d9c0c5e8c 100755 (executable)
--- a/src/buildscript/windows_386.sh
+++ b/src/buildscript/windows_386.sh
@@ -496,5 +496,5 @@ cd "$GOROOT"/src/cmd/go
 "$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 "$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out.exe -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/windows_386/
-cp "$WORK"/cmd/go/_obj/a.out.exe "$GOBIN"/windows_386/go.exe
+mkdir -p "$GOBIN"/
+cp "$WORK"/cmd/go/_obj/a.out.exe "$GOBIN"/go_bootstrap.exe

diff --git a/src/buildscript/windows_amd64.sh b/src/buildscript/windows_amd64.sh
index d316242667024700ab6733f2ae56996383a2cd3e..43617205d90da14457ee5bda354b30cbcc75d7e8 100755 (executable)
--- a/src/buildscript/windows_amd64.sh
+++ b/src/buildscript/windows_amd64.sh
@@ -495,5 +495,5 @@ cd "$GOROOT"/src/cmd/go
 "$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 "$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out.exe -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/windows_amd64/
-cp "$WORK"/cmd/go/_obj/a.out.exe "$GOBIN"/windows_amd64/go.exe
+mkdir -p "$GOBIN"/
+cp "$WORK"/cmd/go/_obj/a.out.exe "$GOBIN"/go_bootstrap.exe