[Python-checkins] cpython (2.7): - Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf

[christian.heimes]

http://hg.python.org/cpython/rev/0fa67e3f195d
changeset:   80675:0fa67e3f195d
branch:      2.7
parent:      80670:c82151aac59a
user:        Christian Heimes <christian at cheimes.de>
date:        Sun Dec 02 08:14:50 2012 +0100
summary:
  - Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf

files:
  Makefile.pre.in |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -410,11 +410,12 @@
 
 
 # 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)' \

-- 
Repository URL: http://hg.python.org/cpython