diff --git a/docs/drivers/panfrost.rst b/docs/drivers/panfrost.rst
index a3fa495aba9..854bb804a17 100644
--- a/docs/drivers/panfrost.rst
+++ b/docs/drivers/panfrost.rst
@@ -60,8 +60,8 @@ LLVM is required by Panfrost's compilers at build time.
 
 In case of cross compilation without LLVM,
 you can build and install the required tools on the host (with LLVM installed) with
-``meson . build-host/ -Dvulkan-drivers=panfrost -Dgallium-drivers=panfrost
--Dmesa-clc=enabled -Dinstall-mesa-clc=true -Dprecomp-compiler=enabled -Dinstall-precomp-compiler=true``
+``meson . build-host/ -Dtools=panfrost -Dmesa-clc=enabled -Dinstall-mesa-clc=true
+-Dprecomp-compiler=enabled -Dinstall-precomp-compiler=true``
 and then use ``-Dmesa-clc=system -Dprecomp-compiler=system`` on the cross compile side.
 
 For general information on building Mesa, read :doc:`the install documentation
diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build
index 5a160067d6e..a8e00d2b82a 100644
--- a/src/panfrost/meson.build
+++ b/src/panfrost/meson.build
@@ -15,9 +15,12 @@ subdir('util')
 subdir('midgard')
 subdir('compiler')
 
-if with_gallium_panfrost or with_panfrost_vk
+if with_gallium_panfrost or with_panfrost_vk or with_tools.contains('panfrost')
    subdir('lib')
    subdir('clc')
+endif
+
+if with_gallium_panfrost or with_panfrost_vk
    subdir('libpan')
    subdir('perf')
 endif