diff options
author | Russ Cox <rsc@golang.org> | 2010-09-21 22:41:32 -0400 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2010-09-21 22:41:32 -0400 |
commit | b11740fb6d2aa61b50a49144a0854ba84483c1f6 (patch) | |
tree | 7ebfcfcc6c9ec0be305960b252a3ade3b35e608d | |
parent | a2450c1456984dfb37de3113dff6497d85fc0fb9 (diff) | |
download | go-b11740fb6d2aa61b50a49144a0854ba84483c1f6.tar.gz go-b11740fb6d2aa61b50a49144a0854ba84483c1f6.zip |
build: fixes for native arm build
R=kaib
CC=golang-dev
https://golang.org/cl/2254044
-rw-r--r-- | src/Make.inc | 2 | ||||
-rwxr-xr-x | test/run | 2 | ||||
-rwxr-xr-x | test/run-arm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Make.inc b/src/Make.inc index 3544f26ca4..6af9145f9e 100644 --- a/src/Make.inc +++ b/src/Make.inc @@ -42,7 +42,7 @@ ifeq ($(GOOS),darwin) GOARCH:=${shell if sysctl machdep.cpu.extfeatures | grep EM64T >/dev/null; then echo amd64; else uname -m | sed 's/i386/386/'; fi} else # Ask uname -m for the processor. -GOARCH:=${shell uname -m | sed 's/^..86$$/386/; s/^.86$$/386/; s/x86_64/amd64/'} +GOARCH:=${shell uname -m | sed 's/^..86$$/386/; s/^.86$$/386/; s/x86_64/amd64/; s/arm.*/arm/'} endif endif @@ -14,7 +14,7 @@ X386) ;; Xarm) export A=5 - export E=${GORUN:-qemu-arm -cpu cortex-a8} + export E="$GORUN" ;; *) echo 1>&2 run: unsupported '$GOARCH' diff --git a/test/run-arm b/test/run-arm index a62df10ca4..b3e3307ed9 100755 --- a/test/run-arm +++ b/test/run-arm @@ -13,7 +13,7 @@ X386) ;; Xarm) export A=5 - export E="${GORUN:-qemu-arm -cpu cortex-a8}" + export E="$GORUN" ;; *) echo 1>&2 run: unsupported '$GOARCH' |