meson: don't build gallium dri target if gallium is disabled
authorDylan Baker <dylan@pnwbakers.com>
Thu, 19 Oct 2017 17:28:37 +0000 (10:28 -0700)
committerDylan Baker <dylan@pnwbakers.com>
Thu, 19 Oct 2017 22:17:34 +0000 (15:17 -0700)
Otherwise -Dgallium-drivers= will cause libmesa_gallium to be built and
the megadriver install script to attempt to install drivers without any
actual drivers being built.

fixes: 66f97f6640f5316b36177fd1053f0027eb6ec6cc ("meson: build radeonsi")
Reported-by: Rafael Antognolli <rafael.antognolli@intel.com>
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Tested-by: Rafael Antognolli <rafael.antognolli@intel.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
src/gallium/meson.build

index a65b32c658effd0b5ca4d64a09e371cdf735ff9e..97347819d60a3b6d8896764644de9844ae8d1d77 100644 (file)
@@ -67,7 +67,7 @@ subdir('state_trackers/dri')
 # TODO: virgl
 # TODO: winsys/sw/xlib
 # TODO: clover
-if with_dri
+if with_dri and with_gallium
   subdir('targets/dri')
 endif
 # TODO: xlib-glx