diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2017-11-08 17:34:55 -0800 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-11-09 21:08:44 +0200 |
commit | a8d3eb3c107c65aa55df982e5d64658fd2e862d9 (patch) | |
tree | d5526fb514821fbfa968e71e981ac4ff0322bd63 | |
parent | a176588151bd5809ed85929d5513cfd5a8791473 (diff) | |
download | meson-a8d3eb3c107c65aa55df982e5d64658fd2e862d9.zip meson-a8d3eb3c107c65aa55df982e5d64658fd2e862d9.tar.gz meson-a8d3eb3c107c65aa55df982e5d64658fd2e862d9.tar.bz2 |
llvm: llvm 5.0 is released and the current stable
So set it as the first versioned config to check for, and add
llvm-config-6.0 to the list of configs.
-rw-r--r-- | mesonbuild/dependencies/dev.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 2ab2847..92d4504 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -117,19 +117,20 @@ class LLVMDependency(ExternalDependency): # 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 + # Please note that llvm-config-6.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 + # llvm-config-6.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', # base - 'llvm-config-4.0', 'llvm-config40', # latest stable release - 'llvm-config-3.9', 'llvm-config39', # old stable releases + 'llvm-config-5.0', 'llvm-config50', # latest stable release + 'llvm-config-4.0', 'llvm-config40', # old stable releases + '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-5.0', 'llvm-config-devel', # development snapshot + 'llvm-config-6.0', 'llvm-config-devel', # development snapshot ] __cpp_blacklist = {'-DNDEBUG'} |