diff options
| author | Shenghou Ma <minux@golang.org> | 2014-07-10 00:46:43 -0400 |
|---|---|---|
| committer | Shenghou Ma <minux@golang.org> | 2014-07-10 00:46:43 -0400 |
| commit | daba707591c5e7fc8b9a7d632c8fff65c128e5fe (patch) | |
| tree | f284d297cde966f2f420842f7493b79ed8104d3c /playground | |
| parent | 4329a10ae7748848fb5aae36d3c660468fe81eec (diff) | |
| download | golang-x-tools-daba707591c5e7fc8b9a7d632c8fff65c128e5fe.tar.gz | |
go.tools/playground/socket: fix nacl/arm command line.
nacl_helper_bootstrap_arm doesn't consult $PATH for sel_ldr_arm.
LGTM=adg
R=adg, dan.kortschak
CC=golang-codereviews
https://golang.org/cl/112010044
Diffstat (limited to 'playground')
| -rw-r--r-- | playground/socket/socket.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/playground/socket/socket.go b/playground/socket/socket.go index 02e1a9c5b..8f4d12d39 100644 --- a/playground/socket/socket.go +++ b/playground/socket/socket.go @@ -356,7 +356,11 @@ func (p *process) naclCmd(bin string) (*exec.Cmd, error) { args = []string{"sel_ldr_x86_32"} case "arm": env = append(env, "NACLENV_GOARCH=arm") - args = []string{"nacl_helper_bootstrap_arm", "sel_ldr_arm", "--reserved_at_zero=0xXXXXXXXXXXXXXXXX"} + selLdr, err := exec.LookPath("sel_ldr_arm") + if err != nil { + return nil, err + } + args = []string{"nacl_helper_bootstrap_arm", selLdr, "--reserved_at_zero=0xXXXXXXXXXXXXXXXX"} default: return nil, errors.New("native client does not support GOARCH=" + runtime.GOARCH) } |