aboutsummaryrefslogtreecommitdiffstats
path: root/include/verbose.mk
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-06-09 15:38:45 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-06-09 15:38:45 +0000
commitf4e7bdac427e5cf7c06378fdb68e6f1780bcaff4 (patch)
treebeda70cdc408c3248d07dec3bf53f7170d5623c2 /include/verbose.mk
parentef36c74b06f8fdc5d4e81b1bdfc1e3ad275e560f (diff)
downloadupstream-f4e7bdac427e5cf7c06378fdb68e6f1780bcaff4.tar.gz
upstream-f4e7bdac427e5cf7c06378fdb68e6f1780bcaff4.tar.bz2
upstream-f4e7bdac427e5cf7c06378fdb68e6f1780bcaff4.zip
large improvement for parallel builds. works without V=99 now and without warnings. tested with -j on an 2x dual core opteron machine
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11414 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include/verbose.mk')
-rw-r--r--include/verbose.mk12
1 files changed, 7 insertions, 5 deletions
diff --git a/include/verbose.mk b/include/verbose.mk
index fed83d6fb6..b414d24409 100644
--- a/include/verbose.mk
+++ b/include/verbose.mk
@@ -8,9 +8,7 @@
ifeq ($(NO_TRACE_MAKE),)
NO_TRACE_MAKE := $(MAKE) V=99
-SUBMAKE := $(MAKE)
export NO_TRACE_MAKE
-export SUBMAKE
endif
ifndef KBUILD_VERBOSE
@@ -27,7 +25,7 @@ endif
ifneq ($(KBUILD_VERBOSE),99)
define MESSAGE
- printf "$(_Y)%s$(_N)\n" "$(1)" >&3
+ printf "$(_Y)%s$(_N)\n" "$(1)" >&254
endef
ifeq ($(QUIET),1)
@@ -39,16 +37,20 @@ ifneq ($(KBUILD_VERBOSE),99)
_NULL:=$(if $(MAKECMDGOALS),$(shell \
$(call MESSAGE, make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)); \
))
+ SUBMAKE=$(MAKE)
else
ifeq ($(KBUILD_VERBOSE),0)
- MAKE:=>/dev/null 2>&1 $(MAKE)
+ SILENT:=>/dev/null 2>&1
+ else
+ SILENT:=
endif
export QUIET:=1
- MAKE:=cmd() { $(MAKE) -s $$* || { echo "make $$*: build failed. Please re-run make with V=99 to see what's going on"; false; } } 3>&1 4>&2; cmd
+ 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
endif
.SILENT: $(MAKECMDGOALS)
else
+ SUBMAKE=$(MAKE)
define MESSAGE
printf "%s\n" "$(1)"
endef