diff options
| author | Tom Rini <[email protected]> | 2026-03-04 11:34:36 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-03-04 11:34:36 -0600 |
| commit | 3e91c6a36a14b38d066186e68f43c6ffe650c3c3 (patch) | |
| tree | 36b802aa35b11e3cea1c835ba2832f1b10417b7c | |
| parent | f473a453b0c03d0042b4422de1d822274d2e2d4e (diff) | |
Revert "kbuild: unexport sub_make_done to fix child make invocations"
This unfortunately introduces failure to build in other cases:
$ make ARCH=riscv CROSS_COMPILE=riscv64-unknown-linux-gnu- O=build \
microchip_mpfs_generic_defconfig
GEN Makefile
#
# configuration written to .config
#
$ make ARCH=riscv CROSS_COMPILE=riscv64-unknown-linux-gnu- O=build
HOSTCC scripts/basic/fixdep
GEN Makefile
HOSTCC scripts/kconfig/conf.o
YACC scripts/kconfig/zconf.tab.[ch]
LEX scripts/kconfig/zconf.lex.c
HOSTCC scripts/kconfig/zconf.tab.o
HOSTLD scripts/kconfig/conf
scripts/kconfig/conf --syncconfig Kconfig
***
*** Configuration file ".config" not found!
***
*** Please run some configurator (e.g. "make oldconfig" or
*** "make menuconfig" or "make xconfig").
***
make[4]: *** [/stuff/u-boot/scripts/kconfig/Makefile:75: syncconfig] Error 1
make[3]: *** [/stuff/u-boot/Makefile:702: syncconfig] Error 2
make[2]: *** [../Makefile:189: __sub-make] Error 2
make[1]: *** No rule to make target 'include/config/auto.conf', needed by 'include/config/uboot.release'. Stop.
make: *** [Makefile:189: __sub-make] Error 2
This reverts commit 4284306d22c5b6d64ecd62b462551d9d313c8104.
Reported-by: Conor Dooley <[email protected]>
Signed-off-by: Tom Rini <[email protected]>
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -194,10 +194,6 @@ endif # sub_make_done # We process the rest of the Makefile if this is the final invocation of make ifeq ($(need-sub-make),) -# Do not propagate sub_make_done to non-submake children (e.g. test scripts -# that invoke make separately with O= need to process the KBUILD_OUTPUT block) -unexport sub_make_done - # Do not print "Entering directory ...", # but we want to display it when entering to the output directory # so that IDEs/editors are able to understand relative filenames. @@ -2741,6 +2737,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 |