[Python-checkins] cpython (merge 3.2 -> default): Fix for fcc629208842
christian.heimes
python-checkins at python.org
Fri Sep 7 02:27:23 CEST 2012
http://hg.python.org/cpython/rev/ffcb7f5f2e48
changeset: 78870:ffcb7f5f2e48
parent: 78868:4807ed8a627e
parent: 78869:abb858a0740f
user: Christian Heimes <christian at cheimes.de>
date: Fri Sep 07 02:26:26 2012 +0200
summary:
Fix for fcc629208842
BSD's make doesn't support some of the features.
files:
Makefile.pre.in | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -202,14 +202,6 @@
PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
#PROFILE_TASK= $(srcdir)/Lib/test/regrtest.py
-# Find the silent flag in MAKEFLAGS. The flags are sorted and normalized
-# by GNU make. The 's' flag is always in the first word.
-ifneq (,$(findstring s,$(word 1,$(MAKEFLAGS))))
- QUIET=-q
-else
- QUIET=
-endif
-
# === Definitions added by makesetup ===
@@ -482,9 +474,15 @@
$(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
+# -s, --silent or --quiet is always the first char.
sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA)
+ @case "$$MAKEFLAGS" in \
+ s*) quiet="-q";; \
+ *) quiet="";; \
+ esac; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
- $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $(QUIET) build
+ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
# Build static library
# avoid long command lines, same as LIBRARY_OBJS
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list