diff options
| author | Elias Naur <mail@eliasnaur.com> | 2019-02-24 13:18:13 +0100 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2019-02-26 17:59:23 +0000 |
| commit | da2d02a9356f2d808992990510eca2b26513be0c (patch) | |
| tree | d8dcafc1ad0377ee711e07bfa85cc7a9f58ae365 /src/iostest.bash | |
| parent | 42a82ce1a7051b3a2762bff73b6eda4797e0fd4b (diff) | |
| download | go-da2d02a9356f2d808992990510eca2b26513be0c.tar.xz | |
cmd/dist: build exec wrappers during bootstrap
The androidtest.bash script encodes the additional steps to build
Go and run tests on Android. In order to add sharded builders and
trybots, Android needs to fit into the usual make.bash + cmd/dist test
pattern.
This change moves building the exec wrapper into cmd/dist bootstrap.
Do the same for iOS while we're here.
Updates #23824
Change-Id: I58a1b0679c3a6c92fdc7fff464b469641f1fee74
Reviewed-on: https://go-review.googlesource.com/c/163618
Run-TryBot: Elias Naur <mail@eliasnaur.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/iostest.bash')
| -rwxr-xr-x | src/iostest.bash | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/iostest.bash b/src/iostest.bash index b402ff0792..1fc1666bae 100755 --- a/src/iostest.bash +++ b/src/iostest.bash @@ -56,14 +56,10 @@ export PATH=$GOROOT/bin:$PATH export CGO_ENABLED=1 export CC_FOR_TARGET=$GOROOT/misc/ios/clangwrap.sh -# Run the build for the host bootstrap, so we can build go_darwin_arm_exec. +# Run the build for the host bootstrap, so we can build detect.go. # Also lets us fail early before the (slow) ios-deploy if the build is broken. ./make.bash -GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH go build \ - -o ../bin/go_darwin_${GOARCH}_exec \ - ../misc/ios/go_darwin_arm_exec.go - if [ "$GOIOS_DEV_ID" = "" ]; then echo "detecting iOS development identity" eval $(GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH go run ../misc/ios/detect.go) |