diff options
| author | Shenghou Ma <minux@golang.org> | 2014-07-10 15:15:41 -0400 |
|---|---|---|
| committer | Shenghou Ma <minux@golang.org> | 2014-07-10 15:15:41 -0400 |
| commit | 99e2a5678601b7452172283d02f5da5cacad6fa2 (patch) | |
| tree | 8bf6bc190a7233d42133bd51ccaa132e4df3611a /src/nacltest.bash | |
| parent | 0829533b6e480d8abdcefe58b25bb07e98b825c4 (diff) | |
| download | go-99e2a5678601b7452172283d02f5da5cacad6fa2.tar.xz | |
nacltest.bash: nacl/arm support.
Also detect GOARCH automatically based on `uname -m`.
LGTM=crawshaw, dave, rsc
R=rsc, iant, crawshaw, dave
CC=golang-codereviews
https://golang.org/cl/111780043
Diffstat (limited to 'src/nacltest.bash')
| -rwxr-xr-x | src/nacltest.bash | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/nacltest.bash b/src/nacltest.bash index 33fc8c1c4e..2b62830a88 100755 --- a/src/nacltest.bash +++ b/src/nacltest.bash @@ -13,8 +13,23 @@ set -e ulimit -c 0 +# guess GOARCH if not set +naclGOARCH=$GOARCH +if [ -z "$naclGOARCH" ]; then + case "$(uname -m)" in + x86_64) + naclGOARCH=amd64p32 + ;; + armv7l) # NativeClient on ARM only supports ARMv7A. + naclGOARCH=arm + ;; + i?86) + naclGOARCH=386 + ;; + esac +fi + # Check GOARCH. -naclGOARCH=${GOARCH:-386} case "$naclGOARCH" in amd64p32) if ! which sel_ldr_x86_64 >/dev/null; then @@ -28,6 +43,12 @@ amd64p32) exit 1 fi ;; +arm) + if ! which sel_ldr_arm >/dev/null; then + echo 'cannot find sel_ldr_arm' 1>&2 + exit 1 + fi + ;; *) echo 'unsupported $GOARCH for nacl: '"$naclGOARCH" 1>&2 exit 1 |