From daba707591c5e7fc8b9a7d632c8fff65c128e5fe Mon Sep 17 00:00:00 2001 From: Shenghou Ma Date: Thu, 10 Jul 2014 00:46:43 -0400 Subject: [PATCH] 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 --- playground/socket/socket.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/playground/socket/socket.go b/playground/socket/socket.go index 02e1a9c5b7..8f4d12d394 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) }