X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/83b31e078f713ebc761f90030d71e12618bd68ad..4d9258acb3abc998fc14ca792ee460052aacd642:/include/verbose.mk?ds=sidebyside diff --git a/include/verbose.mk b/include/verbose.mk index b414d2440..9fe27ced5 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -4,7 +4,6 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id:$ ifeq ($(NO_TRACE_MAKE),) NO_TRACE_MAKE := $(MAKE) V=99 @@ -19,13 +18,15 @@ ifeq ("$(origin V)", "command line") endif ifeq ($(IS_TTY),1) - _Y:=\\033[33m - _N:=\\033[m + ifneq ($(strip $(NO_COLOR)),1) + _Y:=\\033[33m + _N:=\\033[m + endif endif ifneq ($(KBUILD_VERBOSE),99) define MESSAGE - printf "$(_Y)%s$(_N)\n" "$(1)" >&254 + printf "$(_Y)%s$(_N)\n" "$(1)" >&8 endef ifeq ($(QUIET),1) @@ -45,12 +46,12 @@ ifneq ($(KBUILD_VERBOSE),99) SILENT:= endif export QUIET:=1 - SUBMAKE=cmd() { $(SILENT) $(MAKE) -s $$* || { echo "make $$*: build failed. Please re-run make with V=99 to see what's going on"; false; } } 254>&1 255>&2; cmd + SUBMAKE=cmd() { $(SILENT) $(MAKE) -s $$* < /dev/null || { echo "make $$*: build failed. Please re-run make with V=99 to see what's going on"; false; } } 8>&1 9>&2; cmd endif .SILENT: $(MAKECMDGOALS) else - SUBMAKE=$(MAKE) + SUBMAKE=$(MAKE) -w define MESSAGE printf "%s\n" "$(1)" endef