diff options
| author | Bernhard Rosenkränzer <bero@lindev.ch> | 2021-03-02 23:12:11 +0100 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2021-03-10 04:18:28 +0900 |
| commit | 1f09af062556f0610c08e2f3d680a8b8bc40dd48 (patch) | |
| tree | 3d62ac5f1fb86de3fe48feb93b269d3b4421e8a1 | |
| parent | b3d9fc1436808a4ef9927e558b3415e728e710c5 (diff) | |
| download | linux-1f09af062556f0610c08e2f3d680a8b8bc40dd48.tar.bz2 | |
kbuild: Fix ld-version.sh script if LLD was built with LLD_VENDOR
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.
Link: https://lore.kernel.org/lkml/20210302221211.1620858-1-bero@lindev.ch/
Signed-off-by: Bernhard Rosenkränzer <bero@lindev.ch>
[masahiro yamada: refactor the code]
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Nathan Chancellor <nathan@kernel.org>
| -rwxr-xr-x | scripts/ld-version.sh | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/scripts/ld-version.sh b/scripts/ld-version.sh index a463273509b5..30debf78aa09 100755 --- a/scripts/ld-version.sh +++ b/scripts/ld-version.sh @@ -44,14 +44,20 @@ if [ "$1" = GNU -a "$2" = ld ]; then elif [ "$1" = GNU -a "$2" = gold ]; then echo "gold linker is not supported as it is not capable of linking the kernel proper." >&2 exit 1 -elif [ "$1" = LLD ]; then - version=$2 - min_version=$lld_min_version - name=LLD - disp_name=LLD else - echo "$orig_args: unknown linker" >&2 - exit 1 + while [ $# -gt 1 -a "$1" != "LLD" ]; do + shift + done + + if [ "$1" = LLD ]; then + version=$2 + min_version=$lld_min_version + name=LLD + disp_name=LLD + else + echo "$orig_args: unknown linker" >&2 + exit 1 + fi fi # Some distributions append a package release number, as in 2.34-4.fc32 |