Skip to content

Commit 4e25140

Browse files
committed
Fix for fcc629208842
BSD's make doesn't support some of the features.
2 parents 693320a + 5f38121 commit 4e25140

1 file changed

Lines changed: 7 additions & 9 deletions

File tree

‎Makefile.pre.in‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -202,14 +202,6 @@ HOST_GNU_TYPE= @host@
202202
PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
203203
#PROFILE_TASK= $(srcdir)/Lib/test/regrtest.py
204204

205-
# Find the silent flag in MAKEFLAGS. The flags are sorted and normalized
206-
# by GNU make. The 's' flag is always in the first word.
207-
ifneq (,$(findstring s,$(word 1,$(MAKEFLAGS))))
208-
QUIET=-q
209-
else
210-
QUIET=
211-
endif
212-
213205
# === Definitions added by makesetup ===
214206

215207

@@ -482,9 +474,15 @@ $(SYSCONFIGDATA): $(BUILDPYTHON)
482474
$(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
483475

484476
# Build the shared modules
477+
# MAKEFLAGS are sorted and normalized. Under GNU make the 's' for
478+
# -s, --silent or --quiet is always the first char.
485479
sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA)
480+
@case "$$MAKEFLAGS" in \
481+
s*) quiet="-q";; \
482+
*) quiet="";; \
483+
esac; \
486484
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
487-
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $(QUIET) build
485+
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
488486

489487
# Build static library
490488
# avoid long command lines, same as LIBRARY_OBJS

0 commit comments

Comments
 (0)