summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlias Apalodimas <[email protected]>2025-10-22 15:23:15 +0300
committerTom Rini <[email protected]>2025-10-24 13:47:10 -0600
commit38f40e6de6029686356a1b786087385ae974d354 (patch)
tree2b77b0708ed891d73c60d516fc7deb41eb3fbafe
parentb10c055d4e1b5153a331a61ef82a5b01b5bb4c45 (diff)
makefile: Fix recursive makes
Since the Kbuild bump to 5.1 and specifically commit af1a9935708a ("kbuild: make -r/-R effective in top Makefile for old Make versions") the recursion rules have changed. 'make O=/output/dir/' as well as './test/py/test.py --bd sandbox --build' is working fine but anything that recursively called the makefile was failing e.g 'make tests', 'make qcheck' etc, which calls a bash script that ends up calling the makefile again. The reason is that the internal 'sub_make_done' variable of the makefile was set after the first pass and the output dir was never evaluated properly. Reset the variable value if we are executing any of these tests. Fixes: af1a9935708a ("kbuild: make -r/-R effective in top Makefile for old Make versions") Reported-by: Heinrich Schuchardt <[email protected]> Signed-off-by: Ilias Apalodimas <[email protected]> Test-by: Heinrich Schuchardt <[email protected]>
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 2402f9313d8..8cddee3c5a9 100644
--- a/Makefile
+++ b/Makefile
@@ -2666,6 +2666,10 @@ help:
@echo 'Execute "make" or "make all" to build all targets marked with [*] '
@echo 'For further info see the ./README file'
+ifneq ($(filter tests pcheck qcheck tcheck,$(MAKECMDGOALS)),)
+export sub_make_done := 0
+endif
+
tests check:
$(srctree)/test/run