aboutsummaryrefslogtreecommitdiff
path: root/go/go_target_exec
diff options
context:
space:
mode:
Diffstat (limited to 'go/go_target_exec')
-rwxr-xr-xgo/go_target_exec6
1 files changed, 3 insertions, 3 deletions
diff --git a/go/go_target_exec b/go/go_target_exec
index 34d9e799..0a44b4cf 100755
--- a/go/go_target_exec
+++ b/go/go_target_exec
@@ -27,15 +27,15 @@ targetdir="${tmpdir}"
goroot="$(go_${target} env GOROOT)"
if [[ "${PWD}" == ${goroot}/src/* ]]
then
- targetdir="${tmpdir}/go/src/${PWD#${goroot}/src/}"
+ targetdir="${tmpdir}/goroot/src/${PWD#${goroot}/src/}"
fi
# Set GOROOT, and forward some environment variables to the remote shell.
-vars="GOROOT=${tmpdir}/go"
+vars="GOROOT=${tmpdir}/goroot"
vars+="${GOOS:+ GOOS=${GOOS}}"
vars+="${GOARCH:+ GOARCH=${GOARCH}}"
vars+="${GOMAXPROCS:+ GOMAXPROCS=${GOMAXPROCS}}"
vars+="${GOTRACEBACK:+ GOTRACEBACK=${GOTRACEBACK}}"
# Remotely execute the binary using ssh (for ChromeOS) or adb (for Android).
-target_sh ${target} "cd ${targetdir} && ${vars} ${tmpdir}/a.out $*"
+target_sh ${target} "cd ${targetdir} && ${vars} ${GOLOADER} ${tmpdir}/a.out $*"