]> granicus.if.org Git - python/commitdiff
Issue #15591 and Issue #11715: silence output of setup.py when make is run with ...
authorChristian Heimes <christian@cheimes.de>
Thu, 6 Sep 2012 22:56:56 +0000 (00:56 +0200)
committerChristian Heimes <christian@cheimes.de>
Thu, 6 Sep 2012 22:56:56 +0000 (00:56 +0200)
1  2 
Makefile.pre.in

diff --cc Makefile.pre.in
index 681286598d9e2c939e6a02249ddbc0d66d83c15d,41dabd4c4a99725b95d8b27557de314bdfbf5bff..aa091fb8faa87f6c30ab75718d25a83f140f81f3
@@@ -466,23 -440,14 +474,17 @@@ coverage
  $(BUILDPYTHON):       Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
        $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  
 -platform: $(BUILDPYTHON)
 -      $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
 +platform: $(BUILDPYTHON) $(SYSCONFIGDATA)
 +      $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
  
 +# Generate the sysconfig build-time data
 +$(SYSCONFIGDATA): $(BUILDPYTHON)
 +      $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
  
  # Build the shared modules
 -sharedmods: $(BUILDPYTHON)
 +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
 -              ./$(BUILDPYTHON) -E $(srcdir)/setup.py $(QUIET) build
++              $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $(QUIET) build
  
  # Build static library
  # avoid long command lines, same as LIBRARY_OBJS