Improve LLVM version parsing robustness

With the Rust toolchain 1.44.1 the reported LLVM version is 9.0, i.e. without a patch version. Signed-off-by: Jonathan Schwender <[email protected]>
corrosion-rs · Mar 27, 2022 · c6ecc28 · c6ecc28
1 parent 3b2f040
commit c6ecc28
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/cmake/FindRust.cmake b/cmake/FindRust.cmake
@@ -250,10 +250,12 @@ else()
     )
 endif()
 
-if (_RUSTC_VERSION_RAW MATCHES "LLVM version: ([0-9]+)\\.([0-9]+)\\.([0-9]+)")
+if (_RUSTC_VERSION_RAW MATCHES "LLVM version: ([0-9]+)\\.([0-9]+)(\\.([0-9]+))?")
     set(Rust_LLVM_VERSION_MAJOR "${CMAKE_MATCH_1}")
     set(Rust_LLVM_VERSION_MINOR "${CMAKE_MATCH_2}")
-    set(Rust_LLVM_VERSION_PATCH "${CMAKE_MATCH_3}")
+    # With the Rust toolchain 1.44.1 the reported LLVM version is 9.0, i.e. without a patch version.
+    # Since cmake regex does not support non-capturing groups, just ignore Match 3.
+    set(Rust_LLVM_VERSION_PATCH "${CMAKE_MATCH_4}") 
     set(Rust_LLVM_VERSION "${Rust_LLVM_VERSION_MAJOR}.${Rust_LLVM_VERSION_MINOR}.${Rust_LLVM_VERSION_PATCH}")
 else()
     message(