https://git.ruby-lang.org/ruby.git/commit/?id=2f42243bce

From 2f42243bceb60043ca06448a2b419724be0e6d0a Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Tue, 29 Dec 2020 16:51:50 +0900
Subject: Make more silent when -s on GNU make


diff --git a/common.mk b/common.mk
index 43a272b..0f165ba 100644
--- a/common.mk
+++ b/common.mk
@@ -200,7 +200,7 @@ TESTRUN_SCRIPT = $(srcdir)/test.rb https://github.com/ruby/ruby/blob/trunk/common.mk#L200
 COMPILE_PRELUDE = $(tooldir)/generic_erb.rb $(srcdir)/template/prelude.c.tmpl \
 	$(tooldir)/ruby_vm/helpers/c_escape.rb
 
-SHOWFLAGS = showflags
+SHOWFLAGS = $(no_silence:no=showflags)
 
 MAKE_LINK = $(MINIRUBY) -rfileutils -e "include FileUtils::Verbose" \
 	  -e "src, dest = ARGV" \
diff --git a/template/GNUmakefile.in b/template/GNUmakefile.in
index 444e44b..74fbe84 100644
--- a/template/GNUmakefile.in
+++ b/template/GNUmakefile.in
@@ -1,6 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/template/GNUmakefile.in#L1
 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 1f91152..b787615 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -2,6 +2,9 @@ https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L2
 
 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 https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L359
 		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; "$$@"
 
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/