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.
pull/2604/head
Dylan Baker 7 years ago committed by Jussi Pakkanen
parent a176588151
commit a8d3eb3c10
  1. 11
      mesonbuild/dependencies/dev.py

@ -117,19 +117,20 @@ class LLVMDependency(ExternalDependency):
# Ordered list of llvm-config binaries to try. Start with base, then try # 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. # 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 # 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. # Debian and the latter is used by FreeBSD.
llvm_config_bins = [ llvm_config_bins = [
'llvm-config', # base 'llvm-config', # base
'llvm-config-4.0', 'llvm-config40', # latest stable release 'llvm-config-5.0', 'llvm-config50', # latest stable release
'llvm-config-3.9', 'llvm-config39', # old stable releases 'llvm-config-4.0', 'llvm-config40', # old stable releases
'llvm-config-3.9', 'llvm-config39',
'llvm-config-3.8', 'llvm-config38', 'llvm-config-3.8', 'llvm-config38',
'llvm-config-3.7', 'llvm-config37', 'llvm-config-3.7', 'llvm-config37',
'llvm-config-3.6', 'llvm-config36', 'llvm-config-3.6', 'llvm-config36',
'llvm-config-3.5', 'llvm-config35', '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'} __cpp_blacklist = {'-DNDEBUG'}

Loading…
Cancel
Save