summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2012-09-07 02:24:58 +0200
committerChristian Heimes <christian@cheimes.de>2012-09-07 02:24:58 +0200
commitf84dcffcb9d4743565b2dc9a27f23175206af905 (patch)
treeb65b355b066c88536e8f0ae93eec32a6b5ed98e1
parentbc71f2cf98fc86d39768275cfb9408195fd47c09 (diff)
downloadcpython-git-f84dcffcb9d4743565b2dc9a27f23175206af905.tar.gz
Fix for fcc629208842
BSD's make doesn't support some of the features.
-rw-r--r--Makefile.pre.in16
1 files changed, 7 insertions, 9 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index d97c9e62eb..e56a870c3a 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -189,14 +189,6 @@ BUILDPYTHON= python$(BUILDEXE)
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 @@ platform: $(BUILDPYTHON)
# 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