gallium: Require LLVM >= 3.5

[mesa.git] / meson.build

diff --git a/meson.build b/meson.build
index 26c1b0bb376ed167b0ed79ca0ae415885279baac..f6017de7b99db39184c30902578f475c61648f06 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -418,7 +418,9 @@ endif
 
 with_glvnd = get_option('glvnd')
 if with_glvnd
-  if with_glx == 'xlib' or with_glx == 'gallium-xlib'
+  if with_platform_windows
+    error('glvnd cannot be used on Windows')
+  elif with_glx == 'xlib' or with_glx == 'gallium-xlib'
     error('Cannot build glvnd support for GLX that is not DRI based.')
   elif with_glx == 'disabled' and not with_egl
     error('glvnd requires DRI based GLX and/or EGL')
@@ -1262,7 +1264,7 @@ elif with_gallium_swr
 elif with_gallium_opencl or with_gallium_r600
   _llvm_version = '>= 3.9.0'
 else
-  _llvm_version = '>= 3.3.0'
+  _llvm_version = '>= 3.5.0'
 endif
 
 _shared_llvm = get_option('shared-llvm')