about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorAlastair Reid <adreid@google.com>2020-06-16 14:14:36 +0000
committerCristian Cadar <c.cadar@imperial.ac.uk>2020-08-07 19:28:30 +0100
commitf20d52a3b4bef1de7b9b15b793918d9437ba27b4 (patch)
tree814eb4850f8381812132f7d20031128d1756312a
parent07148eeb5ea4d1c6c51e6aa5a666811ef9f50b90 (diff)
downloadklee-f20d52a3b4bef1de7b9b15b793918d9437ba27b4.tar.gz
Tweak LLVM version string parser: support rust
This change allows KLEE to be configured to use the LLVM version
that comes with the Rust compiler instead of a standard version.

e.g., one might configure with

-DLLVM_CONFIG_BINARY=${RUST_SRC}/build/x86_64-unknown-linux-gnu/llvm/bin/llvm-config

For which typical output might be

    10.0.1-rust-dev
-rw-r--r--cmake/find_llvm.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/find_llvm.cmake b/cmake/find_llvm.cmake
index 76418824..c3acf112 100644
--- a/cmake/find_llvm.cmake
+++ b/cmake/find_llvm.cmake
@@ -72,7 +72,7 @@ else()
   # Get LLVM version
   _run_llvm_config(LLVM_PACKAGE_VERSION "--version")
   # Try x.y.z patern
-  set(_llvm_version_regex "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(svn|git)?$")
+  set(_llvm_version_regex "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(svn|git|-rust-dev)?$")
   if ("${LLVM_PACKAGE_VERSION}" MATCHES "${_llvm_version_regex}")
     string(REGEX REPLACE
       "${_llvm_version_regex}"