Project

General

Profile

« Previous | Next » 

Revision 10066

bin/make: moved $make_filter_active test to lib/sh/make.sh make() so that it's also used when make() is run directly (e.g. in a runscript) rather than via the bin/make wrapper in the PATH

View differences:

lib/sh/make.sh
40 40
	(
41 41
		# at verbosity < 4, hide messages about making included Makefiles
42 42
		# this can reduce # lines of output to 1/3 as much
43
		if ! "log+" 3 can_log; then
43
		if test ! "$make_filter_active" && ! "log+" 3 can_log; then
44
			local_export make_filter_active=1
44 45
			local cmd="$(sys_cmd_path "$(self_name)")"; echo_vars cmd
45 46
			fd="$log_fd" clog++ filter_fd sed \
46 47
-e "\%^$cmd ([^-][^[:space:]]*)?Makefile%,/^make\[[[:digit:]]+\]: .*Makefile/d" \
bin/make
10 10
cmd_name_log_inc=1 # don't print make cmd by default
11 11
"log++" set_fds "$log_fd>&1" # use standard make logging port
12 12
if test "$make_filter_active"; then verbosity_compat; fi
13
make_filter_active=1 ${make_filter_active:+sys_cmd }make "$@"
13
make "$@"

Also available in: Unified diff