diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2019-07-01 16:06:18 -0700 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-07-02 23:27:28 +0300 |
commit | e3140fa2d22122a4e64296ec7cb30ce95d08bfe2 (patch) | |
tree | 12a00573296bfa625f1817c753ace0583ea021a5 /mesonbuild/dependencies | |
parent | 38f2034162d77165840317282cf67adff856979b (diff) | |
download | meson-e3140fa2d22122a4e64296ec7cb30ce95d08bfe2.zip meson-e3140fa2d22122a4e64296ec7cb30ce95d08bfe2.tar.gz meson-e3140fa2d22122a4e64296ec7cb30ce95d08bfe2.tar.bz2 |
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
Diffstat (limited to 'mesonbuild/dependencies')
-rw-r--r-- | mesonbuild/dependencies/dev.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index f7b107c..223e6dc 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 |