X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f29bf60fb1e17b3be80e9127332c53fcaebee55b..21a96eeb47f963f2adeb613a9d757e24f4e9c281:/include/subdir.mk diff --git a/include/subdir.mk b/include/subdir.mk index 26a862652..d93d40fca 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -5,7 +5,7 @@ # See /LICENSE for more information. # -SUBTARGETS:=clean download prepare compile install update refresh prereq +SUBTARGETS:=clean download prepare compile install update refresh prereq dist distcheck subtarget-default = $(filter-out ., \ $(if $($(1)/builddirs-$(2)),$($(1)/builddirs-$(2)), \ @@ -34,8 +34,8 @@ define subdir $(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 $(QUILT),,$($(1)/$(bd)/$(target)) $(call $(1)//$(target),$(1)/$(bd)))) - $(if $(BUILD_LOG),@mkdir -p $(TOPDIR)/logs/$(1)/$(bd)) - +$(if $(BUILD_LOG),set -o pipefail;) $$(SUBMAKE) -C $(1)/$(bd) $(target) $(if $(BUILD_LOG),SILENT= 2>&1 | tee $(TOPDIR)/logs/$(1)/$(bd)/$(target).txt) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(target))), || $(call MESSAGE, ERROR: $(1)/$(bd) failed to build.)) + $(if $(BUILD_LOG),@mkdir -p $(BUILD_LOG_DIR)/$(1)/$(bd)) + +$(if $(BUILD_LOG),set -o pipefail;) $$(SUBMAKE) -C $(1)/$(bd) $(target) $(if $(BUILD_LOG),SILENT= 2>&1 | tee $(BUILD_LOG_DIR)/$(1)/$(bd)/$(target).txt) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(target))), || $(call MESSAGE, ERROR: $(1)/$(bd) failed to build.)) $$(if $(call debug,$(1)/$(bd),v),,.SILENT: $(1)/$(bd)/$(target)) # legacy targets