From: "Bernhard Rosenkränzer" <bero@lindev.ch>
To: linux-kernel@vger.kernel.org
Cc: "Bernhard Rosenkränzer" <bero@lindev.ch>
Subject: [PATCH] Fix ld-version.sh script if LLD was built with LLD_VENDOR
Date: Tue, 2 Mar 2021 23:12:11 +0100 [thread overview]
Message-ID: <20210302221211.1620858-1-bero@lindev.ch> (raw)
If LLD was built with -DLLD_VENDOR="xyz", ld.lld --version output
will prefix LLD_VENDOR. Since LLD_VENDOR can contain spaces, the
LLD identifier isn't guaranteed to be $2 either.
Adjust the version checker to handle such versions of lld.
Signed-off-by: Bernhard Rosenkränzer <bero@lindev.ch>
---
scripts/ld-version.sh | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/scripts/ld-version.sh b/scripts/ld-version.sh
index a463273509b5..4c042a306e22 100755
--- a/scripts/ld-version.sh
+++ b/scripts/ld-version.sh
@@ -49,6 +49,18 @@ elif [ "$1" = LLD ]; then
min_version=$lld_min_version
name=LLD
disp_name=LLD
+elif echo "$@" |grep -q ' LLD '; then
+ # if LLD was built with -DLLD_VENDOR="xyz", it ld.lld --version
+ # says "xyz LLD [...]". Since LLD_VENDOR may contain spaces, we
+ # don't know the exact position of "LLD" and the version info
+ # at this point
+ while [ "$1" != "LLD" ]; do
+ shift
+ done
+ version=$2
+ min_version=$lld_min_version
+ name=LLD
+ disp_name=LLD
else
echo "$orig_args: unknown linker" >&2
exit 1
--
2.30.1
next reply other threads:[~2021-03-02 23:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-02 22:12 Bernhard Rosenkränzer [this message]
2021-03-03 4:02 ` [PATCH] Fix ld-version.sh script if LLD was built with LLD_VENDOR Nathan Chancellor
2021-03-03 11:38 ` Masahiro Yamada
2021-03-03 17:45 ` Nathan Chancellor
2021-03-04 3:34 ` Masahiro Yamada
2021-03-09 17:09 ` Masahiro Yamada
2021-03-09 17:31 ` Nathan Chancellor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210302221211.1620858-1-bero@lindev.ch \
--to=bero@lindev.ch \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.