diff --git a/meson.build b/meson.build
index e14f69e7d09..668046293f9 100644
--- a/meson.build
+++ b/meson.build
@@ -263,6 +263,7 @@ if with_any_vk and host_machine.system() == 'windows' and meson.version().versio
 endif
 
 with_any_llvmpipe = with_gallium_llvmpipe or with_swrast_vk
+with_gallium_or_lvp = with_gallium or with_swrast_vk
 
 freedreno_kmds = get_option('freedreno-kmds')
 if freedreno_kmds.length() != 0 and freedreno_kmds != [ 'msm' ] and with_freedreno_vk
@@ -1879,7 +1880,7 @@ elif with_amd_vk and with_aco_tests
   error('ACO tests require LLVM, but LLVM is disabled.')
 elif with_swrast_vk
   error('lavapipe requires LLVM and is enabled, but LLVM is disabled.')
-elif with_gallium_llvmpipe
+elif with_any_llvmpipe
   error('llvmpipe requires LLVM and is enabled, but LLVM is disabled.')
 elif with_gallium_clover
   error('The OpenCL "Clover" state tracker requires LLVM, but LLVM is disabled.')
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index bdf61218623..63298fb5f20 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -52,11 +52,11 @@ if with_any_llvmpipe
 else
   driver_llvmpipe = declare_dependency()
 endif
-if with_gallium_llvmpipe and with_gallium_softpipe
+if with_any_llvmpipe and with_gallium_softpipe
   driver_swrast = declare_dependency(
     dependencies : [ driver_softpipe, driver_llvmpipe ],
   )
-elif with_gallium_llvmpipe
+elif with_any_llvmpipe
   driver_swrast = driver_llvmpipe
 elif with_gallium_softpipe
   driver_swrast = driver_softpipe
diff --git a/src/meson.build b/src/meson.build
index 23d32c41a04..e1fbada2479 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -104,7 +104,11 @@ if with_gallium_asahi or with_tools.contains('asahi')
 endif
 if with_gallium
   subdir('mesa')
+endif
+if with_gallium_or_lvp
   subdir('gallium')
+endif
+if with_gallium
   # This has to be here since it requires libgallium, and subdir cannot
   # contain ..
   if with_tests