From 5a8d1b6431c80c53ea9f2de155906f67a9f664bc Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 26 Sep 2017 13:05:30 -0700 Subject: deps: strip 'svn' from LLVM version --- mesonbuild/dependencies/dev.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index aba4695b5..d2dd1075e 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -163,7 +163,10 @@ class LLVMDependency(ExternalDependency): mlog.log('Dependency LLVM found:', mlog.green('YES')) self.is_found = True - self.version = out.strip() + # Currently meson doesn't really atempt to handle pre-release versions, + # so strip the 'svn' off the end, since it will probably cuase problems + # for users who want the patch version. + self.version = out.strip().rstrip('svn') p, out = Popen_safe( [self.llvmconfig, '--libs', '--ldflags', '--system-libs'])[:2] -- cgit v1.2.1