Revert "verbose.mk: print ERROR messages in non-verbose"

This reverts commit aee3594 as it breaks existing uses of '$(call ERROR_MESSAGE,...)' during verbose builds. For example, 'Build/check-size' doesn't print error messages on failed checks, rather the printing itself fails with: bash: line 1: 8: Bad file descriptor This happens because the commit doesn't properly handle shell redirects across makes/submakes during the build process, and later attempts to fix this showed the problem isn't trivial. Signed-off-by: Tony Ambardar <[email protected]>
guidosarducci · Nov 15, 2023 · 23b3c70 · 23b3c70
1 parent 9ae2484
commit 23b3c70
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/include/verbose.mk b/include/verbose.mk
@@ -29,15 +29,15 @@ ifeq ($(IS_TTY),1)
   endif
 endif
 
-define ERROR_MESSAGE
-  printf "$(_R)%s$(_N)\n" "$(1)" >&8
-endef
-
 ifeq ($(findstring s,$(OPENWRT_VERBOSE)),)
   define MESSAGE
 	printf "$(_Y)%s$(_N)\n" "$(1)" >&8
   endef
 
+  define ERROR_MESSAGE
+	printf "$(_R)%s$(_N)\n" "$(1)" >&8
+  endef
+
   ifeq ($(QUIET),1)
     ifneq ($(CURDIR),$(TOPDIR))
       _DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
@@ -60,4 +60,5 @@ else
   define MESSAGE
     printf "%s\n" "$(1)"
   endef
+  ERROR_MESSAGE=$(MESSAGE)
 endif