mirror of
https://github.com/golang/go
synced 2024-11-25 09:57:57 -07:00
make.bash: exit if dist fails
The shell's -e doesn't work across "eval"; need to error-check by hand. The recent spate of Darwin build failures pointed out that if the first run of cmd/dist fails, we keep going. We shouldn't. R=golang-dev, dsymonds CC=golang-dev https://golang.org/cl/13098043
This commit is contained in:
parent
24f302a69d
commit
e8140bd03c
@ -117,7 +117,12 @@ if [ "$(uname)" == "Darwin" ]; then
|
||||
fi
|
||||
${CC:-gcc} $mflag -O2 -Wall -Werror -o cmd/dist/dist -Icmd/dist "$DEFGOROOT" cmd/dist/*.c
|
||||
|
||||
eval $(./cmd/dist/dist env -p)
|
||||
# -e doesn't propagate out of eval, so check success by hand.
|
||||
eval $(./cmd/dist/dist env -p || echo FAIL=true)
|
||||
if [ "$FAIL" = true ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo
|
||||
|
||||
if [ "$1" = "--dist-tool" ]; then
|
||||
|
Loading…
Reference in New Issue
Block a user