diff options
| author | Ting-Wei Lan <lantw@src.gnome.org> | 2017-06-05 22:37:37 +0800 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-07 19:54:45 +0300 |
| commit | 139152b0ef72f4de5a9e9bbf4d3a69c314dbaf27 (patch) | |
| tree | 8fb11e0d4f52296f8dba01812c111add7ce4ae35 | |
| parent | 5311a274e39b033ae97740f1db90e50ba120fb5e (diff) | |
| download | meson-139152b0ef72f4de5a9e9bbf4d3a69c314dbaf27.zip meson-139152b0ef72f4de5a9e9bbf4d3a69c314dbaf27.tar.gz meson-139152b0ef72f4de5a9e9bbf4d3a69c314dbaf27.tar.bz2 | |
Update the list of possible llvm-config binaries
This commit syncs the list with gnome-builder, which updates its list
in https://bugzilla.gnome.org/show_bug.cgi?id=782296.
llvm-config40 is added becaue LLVM 4.0 becomes a stable release.
llvm-config-5.0 is added to the bottom of the list because it is still
a development snapshot (svn trunk).
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 10f7ad3..76d6691 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -162,11 +162,19 @@ class LLVMDependency(Dependency): # Ordered list of llvm-config binaries to try. Start with base, then try # newest back to oldest (3.5 is abitrary), and finally the devel version. + # Please note that llvm-config-5.0 is a development snapshot and it should + # not be moved to the beginning of the list. The only difference between + # llvm-config-5.0 and llvm-config-devel is that the former is used by + # Debian and the latter is used by FreeBSD. llvm_config_bins = [ - 'llvm-config', 'llvm-config-4.0', '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-devel', + 'llvm-config', # base + 'llvm-config-4.0', 'llvm-config40', # latest stable release + 'llvm-config-3.9', 'llvm-config39', # old stable releases + '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-5.0', 'llvm-config-devel', # development snapshot ] llvmconfig = None _llvmconfig_found = False |