diff options
| author | Elias Naur <mail@eliasnaur.com> | 2020-09-16 15:23:58 +0200 |
|---|---|---|
| committer | Elias Naur <mail@eliasnaur.com> | 2020-10-03 17:02:58 +0000 |
| commit | 869c02ce1f635960bfc2f06bb52e2b4e17eaa199 (patch) | |
| tree | b3941d8aeead90aa9c88334a0c72a055f16bf821 /src | |
| parent | bb48f9925cf541e7b5f4bfafb9d008671c4ace47 (diff) | |
| download | go-869c02ce1f635960bfc2f06bb52e2b4e17eaa199.tar.xz | |
misc/ios: add support for running programs on the iOS simulator
Update the README to mention the emulator. Remove reference to gomobile
while here; there are multiple ways to develop for iOS today, including
using the c-archive buildmode directly.
Updates #38485
Change-Id: Iccef75e646ea8e1b9bc3fc37419cc2d6bf3dfdf4
Reviewed-on: https://go-review.googlesource.com/c/go/+/255257
Run-TryBot: Elias Naur <mail@eliasnaur.com>
TryBot-Result: Go Bot <gobot@golang.org>
Trust: Elias Naur <mail@eliasnaur.com>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/dist/build.go | 2 | ||||
| -rwxr-xr-x | src/iostest.bash | 2 | ||||
| -rw-r--r-- | src/runtime/cgo/gcc_darwin_arm64.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go index 5d62c1e8fa..3b3eb113b1 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -1453,7 +1453,7 @@ func wrapperPathFor(goos, goarch string) string { } case (goos == "darwin" || goos == "ios") && goarch == "arm64": if gohostos != "darwin" || gohostarch != "arm64" { - return pathf("%s/misc/ios/go_darwin_arm_exec.go", goroot) + return pathf("%s/misc/ios/go_ios_exec.go", goroot) } } return "" diff --git a/src/iostest.bash b/src/iostest.bash index 5fa6744979..33b8c101ff 100755 --- a/src/iostest.bash +++ b/src/iostest.bash @@ -38,7 +38,7 @@ if [ "$1" = "-restart" ]; then sleep 30 # Poll until the device has restarted. until idevicediagnostics $IDEVARGS diagnostics; do - # TODO(crawshaw): replace with a test app using go_darwin_arm_exec. + # TODO(crawshaw): replace with a test app using go_ios_exec. echo "waiting for idevice to come online" sleep 10 done diff --git a/src/runtime/cgo/gcc_darwin_arm64.c b/src/runtime/cgo/gcc_darwin_arm64.c index fd7d4084c9..9ea43ae4af 100644 --- a/src/runtime/cgo/gcc_darwin_arm64.c +++ b/src/runtime/cgo/gcc_darwin_arm64.c @@ -131,7 +131,7 @@ init_working_dir() fprintf(stderr, "runtime/cgo: chdir(%s) failed\n", dir); } - // The test harness in go_darwin_arm_exec passes the relative working directory + // The test harness in go_ios_exec passes the relative working directory // in the GoExecWrapperWorkingDirectory property of the app bundle. CFStringRef wd_ref = CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("GoExecWrapperWorkingDirectory")); if (wd_ref != NULL) { |