- Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 44c1f15614b0f1f23f7bd01481b91da6bb5a3804..c014236ce5cdb3adc53d5f8e9b25a2c06a71cbec 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -441,11 +441,12 @@ platform: $(BUILDPYTHON)
 
 
 # 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)
        @case "$$MAKEFLAGS" in \
-           s*) quiet="-q";; \
+           *\ -s*|s*) quiet="-q";; \
            *) quiet="";; \
        esac; \
        $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \

diff --git a/Misc/NEWS b/Misc/NEWS
index b984b9984bf2938a45fea33c0d64f37ff64f19d2..d0960b7a2bf16ba49fc82e9631a305b87b8b9108 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -706,6 +706,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 #15923: fix a mistake in asdl_c.py that resulted in a TypeError after