diff options
| author | Christian Heimes <christian@cheimes.de> | 2012-09-06 23:07:12 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2012-09-06 23:07:12 (GMT) |
| commit | 693320add499820e66a442f3a68f5317cb44d07a (patch) | |
| tree | f3fb66bc40fde1e974cdd5340353a02e3088f5dc | |
| parent | ce66a3e36fc0405cc2c751df4b5ecdd49ec37013 (diff) | |
| parent | 74b65c8ebcc5df066b376aa68570f1d2b1548f97 (diff) | |
| download | cpython-693320add499820e66a442f3a68f5317cb44d07a.zip cpython-693320add499820e66a442f3a68f5317cb44d07a.tar.gz cpython-693320add499820e66a442f3a68f5317cb44d07a.tar.bz2 | |
Issue #15591 and Issue #11715: silence output of setup.py when make is run with -s option.
| -rw-r--r-- | Makefile.pre.in | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 6812865..aa091fb 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -202,6 +202,14 @@ HOST_GNU_TYPE= @host@ 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 === @@ -475,14 +483,8 @@ $(SYSCONFIGDATA): $(BUILDPYTHON) # Build the shared modules sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA) - if which getopt >/dev/null; then \ - mflags=`getopt s $$MAKEFLAGS 2>/dev/null | sed 's/ --.*/ /'`; \ - else \ - mflags=" $$MAKEFLAGS "; \ - fi; \ - case $$mflags in "* -s *") quiet=-q; 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 |