diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2017-09-26 13:05:30 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2017-09-26 17:12:49 -0700 |
| commit | 5a8d1b6431c80c53ea9f2de155906f67a9f664bc (patch) | |
| tree | f5336271417246725e70f6d040aa6c751ce3be08 | |
| parent | 035bee5c543b9809abc1db8a8b93bf8d8205b5a7 (diff) | |
| download | meson-5a8d1b6431c80c53ea9f2de155906f67a9f664bc.tar.gz | |
deps: strip 'svn' from LLVM version
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 5 |
1 files changed, 4 insertions, 1 deletions
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] |