Module: Mesa
Branch: main
Commit: d11900d5e76922790de90ebfb89f918673759a88
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d11900d5e76922790de90ebfb89f918673759a88

Author: Marek Olšák <[email protected]>
Date:   Mon Sep  4 13:27:09 2023 -0400

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 <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25042>

---

 meson.build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meson.build b/meson.build
index 8aa133dbb2e..e4570c59bab 100644
--- a/meson.build
+++ b/meson.build
@@ -1700,6 +1700,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,

Reply via email to