[PATCH 5.7 099/179] kbuild: fix single target builds for external modules

From: Greg Kroah-Hartman
Date: Mon Jul 27 2020 - 10:29:55 EST


From: Masahiro Yamada <masahiroy@xxxxxxxxxx>

[ Upstream commit 20b1be59528295e5c2a8812059b8560753dd8e68 ]

Commit f566e1fbadb6 ("kbuild: make multiple directory targets work")
broke single target builds for external modules. Fix this.

Fixes: f566e1fbadb6 ("kbuild: make multiple directory targets work")
Reported-by: BjÃrn Mork <bjorn@xxxxxxx>
Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
Tested-by: BjÃrn Mork <bjorn@xxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e622e084e7e26..74056e09f0a30 100644
--- a/Makefile
+++ b/Makefile
@@ -1730,7 +1730,7 @@ PHONY += descend $(build-dirs)
descend: $(build-dirs)
$(build-dirs): prepare
$(Q)$(MAKE) $(build)=$@ \
- single-build=$(if $(filter-out $@/, $(filter $@/%, $(single-no-ko))),1) \
+ single-build=$(if $(filter-out $@/, $(filter $@/%, $(KBUILD_SINGLE_TARGETS))),1) \
need-builtin=1 need-modorder=1

clean-dirs := $(addprefix _clean_, $(clean-dirs))
--
2.25.1