diff --git a/include/subdir.mk b/include/subdir.mk
index 046a6adf6f..79624238b5 100644
--- a/include/subdir.mk
+++ b/include/subdir.mk
@@ -39,7 +39,7 @@ define subdir
 	)
   )
   $(foreach target,$(SUBTARGETS),
-    $(call warn_eval,$(1),t,T,$(1)/$(target): $($(1)/) $(foreach bd,$($(1)/builddirs),$(1)/$(bd)/$(target)))
+    $(call warn_eval,$(1),t,T,$(1)/$(target): $($(1)/) $(foreach bd,$(if $($(1)/builddirs-$(target)),$($(1)/builddirs-$(target)),$($(1)/builddirs)),$(1)/$(bd)/$(target)))
   )
 endef