diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-01-19 15:50:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-19 15:50:18 +0200 |
| commit | a941ba219c57b49cc81338a4ff1f31e9d5cd7ee9 (patch) | |
| tree | 01ee7e875f724c4e256c66bd6da82769bcdb9149 /mesonbuild/dependencies/dev.py | |
| parent | 5e4538fe63c49192716528758c6392b8d2057fd0 (diff) | |
| parent | d889989ea1f858759749aef13c0054e5700aa296 (diff) | |
| download | meson-a941ba219c57b49cc81338a4ff1f31e9d5cd7ee9.zip meson-a941ba219c57b49cc81338a4ff1f31e9d5cd7ee9.tar.gz meson-a941ba219c57b49cc81338a4ff1f31e9d5cd7ee9.tar.bz2 | |
Merge pull request #2948 from dcbaker/submit/llvm-robust-strip
Make ConfigTool version suffix stripping robust
Diffstat (limited to 'mesonbuild/dependencies/dev.py')
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 25316df..c254947 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -146,16 +146,6 @@ class LLVMDependency(ConfigToolDependency): return self.static = kwargs.get('static', False) - # Currently meson doesn't really attempt 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. - # - # If LLVM is built from svn then "svn" will be appended to the version - # string, if it's built from a git mirror then "git-<very short sha>" - # will be appended instead. - self.version = self.version.rstrip('svn') - self.version = self.version.split('git')[0] - self.provided_modules = self.get_config_value(['--components'], 'modules') modules = stringlistify(extract_as_list(kwargs, 'modules')) self.check_components(modules) |