From 139152b0ef72f4de5a9e9bbf4d3a69c314dbaf27 Mon Sep 17 00:00:00 2001 From: Ting-Wei Lan Date: Mon, 5 Jun 2017 22:37:37 +0800 Subject: [PATCH] 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). --- mesonbuild/dependencies/dev.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 10f7ad381..76d6691e6 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