summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2012-12-02 07:14:50 (GMT)
committerChristian Heimes <christian@cheimes.de>2012-12-02 07:14:50 (GMT)
commit8ca1d5f7624b6304dceb575f334fcab8a17e59b2 (patch)
tree6973245e917b15eecc4694c29512e45de0d9a85e
parent343d530d67542d2272f2f72afff8a476bb7f9e8b (diff)
downloadcpython-8ca1d5f7624b6304dceb575f334fcab8a17e59b2.zip
cpython-8ca1d5f7624b6304dceb575f334fcab8a17e59b2.tar.gz
cpython-8ca1d5f7624b6304dceb575f334fcab8a17e59b2.tar.bz2
- Issue #16593: Have BSD 'make -s' do the right thing, thanks to Daniel Shahaf
-rw-r--r--Makefile.pre.in5
-rw-r--r--Misc/NEWS2
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 44c1f15..c014236 100644
--- 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 b984b99..d0960b7 100644
--- 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