diff options
author | Marek Olšák <marek.olsak@amd.com> | 2023-09-04 13:27:09 -0400 |
---|---|---|
committer | Dylan Baker <dylan.c.baker@intel.com> | 2023-10-05 09:35:04 -0700 |
commit | c21e517bcdc5883e75fca67f29312dc41773137b (patch) | |
tree | db4344ad43c746239e8b7d7018816f4ecb779b04 | |
parent | f47f6d780a3a407d093ea1ab839ae57271bb564d (diff) |
meson: use llvm-config instead of cmake to fix linking errors with meson 1.2.1
The cmake path picks a random LLVM in /usr, which happens to be 32-bit LLVM,
which fails to link with 64-bit Mesa. This is a meson, cmake, or LLVM bug.
Acked-by: Dylan Baker <dylan@pnwbakers.com>
(cherry picked from commit d11900d5e76922790de90ebfb89f918673759a88)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25438>
-rw-r--r-- | meson.build | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meson.build b/meson.build index 59732981b8a..f68a9e21a8d 100644 --- a/meson.build +++ b/meson.build @@ -1681,6 +1681,7 @@ with_llvm = false if _llvm.allowed() dep_llvm = dependency( 'llvm', + method : host_machine.system() == 'windows' ? 'auto' : 'config-tool', version : _llvm_version, modules : llvm_modules, optional_modules : llvm_optional_modules, |