diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-12-29 16:51:50 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-12-29 17:45:19 +0900 |
| commit | 2f42243bceb60043ca06448a2b419724be0e6d0a (patch) | |
| tree | 21348dda888d82d58ff88305201445f17c0fd72e /template | |
| parent | d57c5a7b61c256f3216e82fe1ca6b5b6b9e50752 (diff) | |
Make more silent when -s on GNU make
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4011
Diffstat (limited to 'template')
| -rw-r--r-- | template/GNUmakefile.in | 1 | ||||
| -rw-r--r-- | template/Makefile.in | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/template/GNUmakefile.in b/template/GNUmakefile.in index 444e44b3d3..74fbe84140 100644 --- a/template/GNUmakefile.in +++ b/template/GNUmakefile.in @@ -1,6 +1,7 @@ gnumake = yes include Makefile +override silence := $(if $(findstring s,$(firstword $(MFLAGS))),yes,no) ifeq ($(HAVE_BASERUBY),yes) override REVISION_FORCE := PHONY diff --git a/template/Makefile.in b/template/Makefile.in index 1f911524fe..b787615890 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -2,6 +2,9 @@ SHELL = /bin/sh NULLCMD = @NULLCMD@ +silence = no # yes/no +yes_silence = $(silence:no=) +no_silence = $(silence:yes=) n=$(NULLCMD) ECHO1 = $(V:1=$n) RUNCMD = $(SHELL) @@ -356,8 +359,8 @@ uncommon.mk: $(srcdir)/common.mk sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@ .PHONY: reconfig -reconfig-args = $(srcdir)/$(CONFIGURE) $(configure_args) -config.status-args = ./config.status --recheck +reconfig-args = $(srcdir)/$(CONFIGURE) $(yes_silence:yes=-s) $(configure_args) +config.status-args = ./config.status $(yes_silence:yes=-s) --recheck reconfig-exec-0 = test -t 1 && { : $${CONFIGURE_TTY=yes}; export CONFIGURE_TTY; }; exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3 3>&- 4>&-` reconfig-exec-1 = set -x; "$$@" |