]> Cypherpunks repositories - gostls13.git/commitdiff
make.bash: do not overwrite GO_LDSO if already set
authorCherry Mui <cherryyz@google.com>
Fri, 6 Aug 2021 19:37:10 +0000 (15:37 -0400)
committerCherry Mui <cherryyz@google.com>
Fri, 6 Aug 2021 22:33:46 +0000 (22:33 +0000)
Change-Id: I704bdb411bda3d8a40906c12f182e268dca4718f
Reviewed-on: https://go-review.googlesource.com/c/go/+/340450
Trust: Cherry Mui <cherryyz@google.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>

src/make.bash

index 4fb13f62758d7910d837225ab195ff49897ce96c..f5e1b60bd5f0c6fc8ec2f96eeba42762445cb56f 100755 (executable)
@@ -130,8 +130,8 @@ if [ "$(uname -s)" = "GNU/kFreeBSD" ]; then
        export CGO_ENABLED=0
 fi
 
-# Test which linker/loader our system is using
-if type readelf >/dev/null 2>&1; then
+# Test which linker/loader our system is using, if GO_LDSO is not set.
+if [ -z "$GO_LDSO" ] && type readelf >/dev/null 2>&1; then
        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"