projects
/
lede.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: fix aarch64 default cpu selection
[lede.git]
/
include
/
verbose.mk
diff --git
a/include/verbose.mk
b/include/verbose.mk
index f795e28045b0c60084a26b83692fe7707ecfaf73..b7e43f74300edbe54094641d157ff7f11b3bdd90 100644
(file)
--- a/
include/verbose.mk
+++ b/
include/verbose.mk
@@
-1,32
+1,46
@@
-#
+#
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
-ifeq ($(NO_TRACE_MAKE),)
-NO_TRACE_MAKE := $(MAKE) V=99
-export NO_TRACE_MAKE
+ifndef OPENWRT_VERBOSE
+ OPENWRT_VERBOSE:=
+endif
+ifeq ("$(origin V)", "command line")
+ OPENWRT_VERBOSE:=$(V)
endif
endif
-if
ndef KBUILD_VERBOSE
- KBUILD_VERBOSE:=0
+if
eq ($(OPENWRT_VERBOSE),1)
+ OPENWRT_VERBOSE:=w
endif
endif
-ifeq ("$(origin V)", "command line")
- KBUILD_VERBOSE:=$(V)
+ifeq ($(OPENWRT_VERBOSE),99)
+ OPENWRT_VERBOSE:=s
+endif
+
+ifeq ($(NO_TRACE_MAKE),)
+NO_TRACE_MAKE := $(MAKE) V=s$(OPENWRT_VERBOSE)
+export NO_TRACE_MAKE
endif
ifeq ($(IS_TTY),1)
endif
ifeq ($(IS_TTY),1)
- _Y:=\\033[33m
- _N:=\\033[m
+ ifneq ($(strip $(NO_COLOR)),1)
+ _Y:=\\033[33m
+ _R:=\\033[31m
+ _N:=\\033[m
+ endif
endif
endif
-if
neq ($(KBUILD_VERBOSE),99
)
+if
eq ($(findstring s,$(OPENWRT_VERBOSE)),
)
define MESSAGE
printf "$(_Y)%s$(_N)\n" "$(1)" >&8
endef
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})
ifeq ($(QUIET),1)
ifneq ($(CURDIR),$(TOPDIR))
_DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
@@
-38,13
+52,9
@@
ifneq ($(KBUILD_VERBOSE),99)
))
SUBMAKE=$(MAKE)
else
))
SUBMAKE=$(MAKE)
else
- ifeq ($(KBUILD_VERBOSE),0)
- SILENT:=>/dev/null 2>&1
- else
- SILENT:=
- endif
+ SILENT:=>/dev/null $(if $(findstring w,$(OPENWRT_VERBOSE)),,2>&1)
export QUIET:=1
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; } } 8>&1 9>&2; cmd
+ SUBMAKE=cmd() { $(SILENT) $(MAKE) -s $$*
< /dev/null || { echo "make $$*: build failed. Please re-run make with -j1 V=s
to see what's going on"; false; } } 8>&1 9>&2; cmd
endif
.SILENT: $(MAKECMDGOALS)
endif
.SILENT: $(MAKECMDGOALS)
@@
-53,4
+63,5
@@
else
define MESSAGE
printf "%s\n" "$(1)"
endef
define MESSAGE
printf "%s\n" "$(1)"
endef
+ ERROR_MESSAGE=$(MESSAGE)
endif
endif