diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-01 15:59:46 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-01 15:59:46 -1000 |
| commit | f7292c0934a848a3fc52c0926203417b5613c69c (patch) | |
| tree | b8192ae4d00cef6b5faa80649c5fe5f055171623 /scripts/rustc-llvm-version.sh | |
| parent | 05b92660cdfe53a49425467fa64b5ac4451a7f9e (diff) | |
| parent | 2313ab74c3004089ecac5f0f91f7274829f3825b (diff) | |
Merge tag 'rust-fixes-6.12-3' of https://github.com/Rust-for-Linux/linux
Pull rust fixes from Miguel Ojeda:
"Toolchain and infrastructure:
- Avoid build errors with old 'rustc's without LLVM patch version
(important since it impacts people that do not even enable Rust)
- Update LLVM version for 'HAVE_CFI_ICALL_NORMALIZE_INTEGERS' in
'depends on' condition (the fix was eventually backported rather
than land in LLVM 19)"
* tag 'rust-fixes-6.12-3' of https://github.com/Rust-for-Linux/linux:
cfi: tweak llvm version for HAVE_CFI_ICALL_NORMALIZE_INTEGERS
kbuild: rust: avoid errors with old `rustc`s without LLVM patch version
Diffstat (limited to 'scripts/rustc-llvm-version.sh')
| -rwxr-xr-x | scripts/rustc-llvm-version.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/rustc-llvm-version.sh b/scripts/rustc-llvm-version.sh index b6063cbe5bdc..a500d1ae3101 100755 --- a/scripts/rustc-llvm-version.sh +++ b/scripts/rustc-llvm-version.sh @@ -13,7 +13,7 @@ get_canonical_version() echo $((10000 * $1 + 100 * $2 + $3)) } -if output=$("$@" --version --verbose 2>/dev/null | grep LLVM); then +if output=$("$@" --version --verbose 2>/dev/null | grep -E 'LLVM.*[0-9]+\.[0-9]+\.[0-9]+'); then set -- $output get_canonical_version $3 else |