dependencies/dev: Switch order of llvm dependency finders

Cmake ignores shared vs dynamic linking, and always returns static. This
went unnoticed, but results in regresssions for mesa. We need to fix
cmake, but with 0.51.1 due out shortly switching the order provides a
quick fix to restore expected functionality seems acceptable.

Fixes #5568
pull/5594/head
Dylan Baker 5 years ago committed by Jussi Pakkanen
parent 38f2034162
commit e3140fa2d2
  1. 6
      mesonbuild/dependencies/dev.py

@ -460,12 +460,12 @@ class LLVMDependency(ExternalDependency):
methods = cls._process_method_kw(kwargs)
candidates = []
if DependencyMethods.CMAKE in methods:
candidates.append(functools.partial(LLVMDependencyCMake, env, kwargs))
if DependencyMethods.CONFIG_TOOL in methods:
candidates.append(functools.partial(LLVMDependencyConfigTool, env, kwargs))
if DependencyMethods.CMAKE in methods:
candidates.append(functools.partial(LLVMDependencyCMake, env, kwargs))
return candidates
@staticmethod

Loading…
Cancel
Save