]> granicus.if.org Git - python/commitdiff
Fix for fcc629208842
authorChristian Heimes <christian@cheimes.de>
Fri, 7 Sep 2012 00:26:26 +0000 (02:26 +0200)
committerChristian Heimes <christian@cheimes.de>
Fri, 7 Sep 2012 00:26:26 +0000 (02:26 +0200)
BSD's make doesn't support some of the features.

1  2 
Makefile.pre.in

diff --cc Makefile.pre.in
index aa091fb8faa87f6c30ab75718d25a83f140f81f3,5cb6774130cbc1305956981b243a01468dbfe7d3..cbc1f9e774ff097e4f0c012995d170e87154ebd5
@@@ -474,17 -432,20 +466,23 @@@ 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)
+ # 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
 -              ./$(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