From 690a8c3fb136431d4f22894c545ea99278758570 Mon Sep 17 00:00:00 2001 From: Cherry Mui Date: Thu, 13 May 2021 19:22:57 -0400 Subject: [PATCH] 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 Run-TryBot: Cherry Mui TryBot-Result: Go Bot Reviewed-by: Ian Lance Taylor Reviewed-by: Cuong Manh Le --- src/make.bash | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/make.bash b/src/make.bash index 3d1b0c87e7..4fb13f6275 100755 --- a/src/make.bash +++ b/src/make.bash @@ -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. -- 2.50.0