[Python-checkins] cpython (merge 2.7 -> 2.7): Fix for fcc629208842
christian.heimes
python-checkins at python.org
Sat Sep 8 19:12:57 CEST 2012
http://hg.python.org/cpython/rev/0ee8ce24fcd0
changeset: 78883:0ee8ce24fcd0
branch: 2.7
parent: 78881:a2147bbf7868
parent: 78882:d19fa616b8fa
user: Christian Heimes <christian at cheimes.de>
date: Sat Sep 08 19:12:05 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
@@ -189,14 +189,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 ===
@@ -416,9 +408,15 @@
# 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)
+ @case "$$MAKEFLAGS" in \
+ s*) quiet="-q";; \
+ *) quiet="";; \
+ esac; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
- ./$(BUILDPYTHON) -E $(srcdir)/setup.py $(QUIET) build
+ ./$(BUILDPYTHON) -E $(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