Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf

diff --git a/Makefile.pre.in b/Makefile.pre.in
index ece1f34063cc800b025ec2f42fcda173f6492021..54755b914a872c3b3b5e4b9186387395a3437509 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -478,11 +478,12 @@ pybuilddir.txt: $(BUILDPYTHON)
        $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
 
 # Build the shared modules
-# MAKEFLAGS are sorted and normalized. Under GNU make the 's' for
+# Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
 # -s, --silent or --quiet is always the first char.
+# Under BSD make, MAKEFLAGS might be " -s -v x=y".
 sharedmods: $(BUILDPYTHON) pybuilddir.txt
        @case "$$MAKEFLAGS" in \
-           s*) quiet="-q";; \
+           *\ -s*|s*) quiet="-q";; \
            *) quiet="";; \
        esac; \
        $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \

diff --git a/Misc/ACKS b/Misc/ACKS
index 253d187e9669c11f14182efb28c63adce9526d0c..7e6beeebcdba54a01d8135d0787027934a973aca 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1075,6 +1075,7 @@ Jerry Seutter
 Pete Sevander
 Denis Severson
 Ian Seyer
+Daniel Shahaf
 Ha Shao
 Mark Shannon
 Richard Shapiro

diff --git a/Misc/NEWS b/Misc/NEWS
index 5fe7d1d18f021791df1062bf41deca7bb7fd5191..739a5eac7d3552cc2f16e64d1544c286088e6b20 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -408,6 +408,8 @@ Tests
 Build
 -----
 
+- Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf
+
 - Issue #16262: fix out-of-src-tree builds, if mercurial is not installed.
 
 - Issue #15298: ensure _sysconfigdata is generated in build directory, not