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

[christian.heimes]

http://hg.python.org/cpython/rev/323f0aeba89d
changeset:   80674:323f0aeba89d
branch:      3.3
parent:      80658:cff7995ca7e8
parent:      80673:ceb325fdd54e
user:        Christian Heimes <christian at cheimes.de>
date:        Sun Dec 02 08:23:05 2012 +0100
summary:
  Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf

files:
  Makefile.pre.in |  5 +++--
  Misc/NEWS       |  2 ++
  2 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -478,11 +478,12 @@
 	$(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/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -277,6 +277,8 @@
 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

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