mirror of
https://github.com/golang/go
synced 2024-09-04 23:44:16 +00:00
make.bash: fix misuse of continue
Apparently, in bash, the "continue" keyword can only be used inside of a loop, not in an if block. If readelf exists but $CC does not, make.bash emits a warning: ./make.bash: line 135: continue: only meaningful in a `for', `while', or `until' loop Change it to a conditional. Change-Id: I00a0940ed99bc0c565094e506705961b6b3d362e Reviewed-on: https://go-review.googlesource.com/c/go/+/320170 Trust: Cherry Mui <cherryyz@google.com> Run-TryBot: Cherry Mui <cherryyz@google.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org> Reviewed-by: Cuong Manh Le <cuong.manhle.vn@gmail.com>
This commit is contained in:
parent
8b0901fd32
commit
690a8c3fb1
|
@ -132,10 +132,11 @@ fi
|
|||
|
||||
# Test which linker/loader our system is using
|
||||
if type readelf >/dev/null 2>&1; then
|
||||
echo "int main() { return 0; }" | ${CC:-cc} -o ./test-musl-ldso -x c - || continue
|
||||
LDSO=$(readelf -l ./test-musl-ldso | grep 'interpreter:' | sed -e 's/^.*interpreter: \(.*\)[]]/\1/') >/dev/null 2>&1
|
||||
[ -z "$LDSO" ] || export GO_LDSO="$LDSO"
|
||||
rm -f ./test-musl-ldso
|
||||
if echo "int main() { return 0; }" | ${CC:-cc} -o ./test-musl-ldso -x c - >/dev/null 2>&1; then
|
||||
LDSO=$(readelf -l ./test-musl-ldso | grep 'interpreter:' | sed -e 's/^.*interpreter: \(.*\)[]]/\1/') >/dev/null 2>&1
|
||||
[ -z "$LDSO" ] || export GO_LDSO="$LDSO"
|
||||
rm -f ./test-musl-ldso
|
||||
fi
|
||||
fi
|
||||
|
||||
# Clean old generated file that will cause problems in the build.
|
||||
|
|
Loading…
Reference in a new issue