From 1315d219498e25e9cfe3c9666855b71fa4013cdb Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 19 Sep 2026 09:55:39 +0200 Subject: [PATCH] build: log failed host builds in the error file of the subdir Commit 501123eb7a ("include/subdir: on build failure always print error") passes $(2) instead of $(1) to ERROR for the builds of a build type, such as host builds. subdir has no second parameter, so with BUILD_LOG set a failed host build is written to logs/error.txt instead of logs/package/error.txt, where the other errors of the subdir go. Fixes: 501123eb7a ("include/subdir: on build failure always print error") Signed-off-by: John Crispin --- include/subdir.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/subdir.mk b/include/subdir.mk index 6908b083758..a9785637a62 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -68,7 +68,7 @@ define subdir $(foreach btype,$(buildtypes-$(bd)), $(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(btype)/$(target): $(if $(NO_DEPS)$(QUILT),,$($(1)/$(bd)/$(btype)/$(target)) $(call $(1)//$(btype)/$(target),$(1)/$(bd)/$(btype)))) $(call log_make,$(1)/$(bd),$(target),$(btype),$(filter-out __default,$(variant)),$($(1)/$(bd)/variants)) \ - || $(call ERROR,$(2), ERROR: $(1)/$(bd) [$(btype)] failed to build.,$(findstring $(bd),$($(1)/builddirs-ignore-$(btype)-$(target)))) + || $(call ERROR,$(1), ERROR: $(1)/$(bd) [$(btype)] failed to build.,$(findstring $(bd),$($(1)/builddirs-ignore-$(btype)-$(target)))) $(if $(call diralias,$(bd)),$(call warn_eval,$(1)/$(bd),l,T,$(1)/$(call diralias,$(bd))/$(btype)/$(target): $(1)/$(bd)/$(btype)/$(target))) ) $(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(target): $(if $(NO_DEPS)$(QUILT),,$($(1)/$(bd)/$(target)) $(call $(1)//$(target),$(1)/$(bd))))