From e3140fa2d22122a4e64296ec7cb30ce95d08bfe2 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 1 Jul 2019 16:06:18 -0700 Subject: [PATCH] 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 --- mesonbuild/dependencies/dev.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index f7b107ca8..223e6dc71 100644 --- a/mesonbuild/dependencies/dev.py +++ b/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