diff options
| author | Dave Cheney <dave@cheney.net> | 2015-02-06 11:44:09 +1100 |
|---|---|---|
| committer | Dave Cheney <dave@cheney.net> | 2015-02-10 00:17:06 +0000 |
| commit | e6fbce3596c1200825db78d338b98cbc80dc5665 (patch) | |
| tree | 2e22231a6d09ed7afef506daf4fe922b8f668650 /src/nacltest.bash | |
| parent | 06611434479daf7d27bd2cd69d10be7d4cb5cd61 (diff) | |
| download | go-git-e6fbce3596c1200825db78d338b98cbc80dc5665.tar.gz | |
cmd/dist: reactivate vfp detection on linux/arm
Fixes #9732
Fixes #9819
Rather than detecting vfp support via catching SIGILL signals,
parse the contents of /proc/cpuinfo.
As the GOARM values for NaCl and freebsd are hard coded, this parsing
logic only needs to support linux/arm.
This change also fixes the nacl/arm build which is broken because the
first stage of nacltest.bash is executed with GOARM=5, embedding that
into 5g.
The second stage of nacltest.bash correctly detects GOARM=7, but this is
ignored as we pass --no-clean at that point, and thus do not replace
the compiler.
Lastyly, include a fix to error message in nacltest.bash
Change-Id: I13f306ff07a99b44b493fade72ac00d0d5097e1c
Reviewed-on: https://go-review.googlesource.com/3981
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/nacltest.bash')
| -rwxr-xr-x | src/nacltest.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nacltest.bash b/src/nacltest.bash index 6220d39f13..534f1ef5af 100755 --- a/src/nacltest.bash +++ b/src/nacltest.bash @@ -62,7 +62,7 @@ fi # Run host build to get toolchain for running zip generator. unset GOOS GOARCH if [ ! -f make.bash ]; then - echo 'nacl.bash must be run from $GOROOT/src' 1>&2 + echo 'nacltest.bash must be run from $GOROOT/src' 1>&2 exit 1 fi GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH ./make.bash |