diff --git a/src/amd/meson.build b/src/amd/meson.build
index 37f9b570437..f394f38f2cb 100644
--- a/src/amd/meson.build
+++ b/src/amd/meson.build
@@ -20,12 +20,14 @@
 
 inc_amd = include_directories('.')
 
-subdir('addrlib')
-subdir('common')
-if with_llvm
-  subdir('llvm')
-else
-  libamd_common_llvm = []
+if with_amd_vk or with_gallium_radeonsi
+  subdir('addrlib')
+  subdir('common')
+  if with_llvm
+    subdir('llvm')
+  else
+    libamd_common_llvm = []
+  endif
 endif
 if with_amd_vk
   subdir('compiler')
diff --git a/src/meson.build b/src/meson.build
index 1e9a39b52df..e5510452775 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -84,7 +84,7 @@ endif
 if with_any_intel
   subdir('intel')
 endif
-if with_gallium_radeonsi or with_amd_vk
+if with_gallium_radeonsi or with_amd_vk or with_gallium_r300 or with_gallium_r600
   subdir('amd')
 endif
 if with_any_broadcom