gallivm: use fallback code for mul_hi with llvm >= 7.0

[mesa.git] / meson.build

diff --git a/meson.build b/meson.build
index 379090fbbf6a3276b916fdbf449381397601bb7f..501957e35e1ad3e1fc477fecedfea43e71d5f4e1 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -26,7 +26,7 @@ project(
   ).stdout(),
   license : 'MIT',
   meson_version : '>= 0.46',
-  default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++11']
+  default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++14']
 )
 
 cc = meson.get_compiler('c')
@@ -62,6 +62,7 @@ if with_tools.contains('all')
     'glsl',
     'intel',
     'intel-ui',
+    'lima',
     'nir',
     'nouveau',
     'xvmc',
@@ -1242,7 +1243,7 @@ if with_gallium_opencl
 endif
 
 if with_amd_vk or with_gallium_radeonsi
-  _llvm_version = '>= 7.0.0'
+  _llvm_version = '>= 8.0.0'
 elif with_gallium_swr
   _llvm_version = '>= 6.0.0'
 elif with_gallium_opencl or with_gallium_r600