Revert "utils/u_math: break dependency on gallium/utils"

[mesa.git] / meson.build

diff --git a/meson.build b/meson.build
index 0588ebf8e7a9a18b498df4a4c42686578e32c665..5e250470ed1ce14f899e0d19171ce707f6791bb0 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1188,6 +1188,8 @@ else
   _llvm_version = '>= 3.3.0'
 endif
 
+_shared_llvm = get_option('shared-llvm')
+
 _llvm = get_option('llvm')
 if _llvm == 'auto'
   dep_llvm = dependency(
@@ -1196,6 +1198,7 @@ if _llvm == 'auto'
     modules : llvm_modules,
     optional_modules : llvm_optional_modules,
     required : with_amd_vk or with_gallium_radeonsi or with_gallium_swr or with_gallium_opencl,
+    static : not _shared_llvm
   )
   with_llvm = dep_llvm.found()
 elif _llvm == 'true'
@@ -1204,6 +1207,7 @@ elif _llvm == 'true'
     version : _llvm_version,
     modules : llvm_modules,
     optional_modules : llvm_optional_modules,
+    static : not _shared_llvm,
   )
   with_llvm = true
 else