aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/dev.py
diff options
context:
space:
mode:
authorTing-Wei Lan <lantw@src.gnome.org>2019-09-19 20:49:33 +0800
committerTing-Wei Lan <lantw@src.gnome.org>2019-09-29 00:11:13 +0800
commit08ce1fb541374fb1ddce1d7318ceb92459942e9e (patch)
tree9f974d70cbfae8cca8ef17ee2acfc2aa6f34dd85 /mesonbuild/dependencies/dev.py
parentd6c4e79c8443005639c60693510a5f62d6e0dc96 (diff)
downloadmeson-08ce1fb541374fb1ddce1d7318ceb92459942e9e.zip
meson-08ce1fb541374fb1ddce1d7318ceb92459942e9e.tar.gz
meson-08ce1fb541374fb1ddce1d7318ceb92459942e9e.tar.bz2
Move the list of LLVM version suffixes to a common place
Both scan-build and llvm-config need the same list of LLVM version suffixes. It is better to keep the list at a common place instead of having several copies in different files, which is likely to become out-of-sync when the list is updated.
Diffstat (limited to 'mesonbuild/dependencies/dev.py')
-rw-r--r--mesonbuild/dependencies/dev.py21
1 files changed, 2 insertions, 19 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py
index 223e6dc..6288739 100644
--- a/mesonbuild/dependencies/dev.py
+++ b/mesonbuild/dependencies/dev.py
@@ -22,6 +22,7 @@ import re
from .. import mesonlib, mlog
from ..mesonlib import version_compare, stringlistify, extract_as_list, MachineChoice
+from ..environment import get_llvm_tool_names
from .base import (
DependencyException, DependencyMethods, ExternalDependency, PkgConfigDependency,
strip_system_libdirs, ConfigToolDependency, CMakeDependency, HasNativeKwarg
@@ -208,25 +209,7 @@ class LLVMDependencyConfigTool(ConfigToolDependency):
# before `super().__init__` is called.
HasNativeKwarg.__init__(self, kwargs)
- # Ordered list of llvm-config binaries to try. Start with base, then try
- # newest back to oldest (3.5 is arbitrary), and finally the devel version.
- # Please note that llvm-config-6.0 is a development snapshot and it should
- # not be moved to the beginning of the list.
- self.tools = [
- 'llvm-config', # base
- 'llvm-config-8', 'llvm-config80',
- 'llvm-config-7', 'llvm-config70',
- 'llvm-config-6.0', 'llvm-config60',
- 'llvm-config-5.0', 'llvm-config50',
- 'llvm-config-4.0', 'llvm-config40',
- 'llvm-config-3.9', 'llvm-config39',
- 'llvm-config-3.8', 'llvm-config38',
- 'llvm-config-3.7', 'llvm-config37',
- 'llvm-config-3.6', 'llvm-config36',
- 'llvm-config-3.5', 'llvm-config35',
- 'llvm-config-9', # Debian development snapshot
- 'llvm-config-devel', # FreeBSD development snapshot
- ]
+ self.tools = get_llvm_tool_names('llvm-config')
# Fedora starting with Fedora 30 adds a suffix of the number
# of bits in the isa that llvm targets, for example, on x86_64