From 97c8845fe7393e8371e9f58dd319e0d7dd4f70d3 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Thu, 17 Mar 2022 07:20:01 +0000 Subject: [PATCH] build-math-object Gbp-Pq: Name build-math-object.diff --- Makefile.pre.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index fa3c07a..4cc0182 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -22,7 +22,8 @@ MODBUILT_NAMES= _MODBUILT_NAMES_ MODDISABLED_NAMES= _MODDISABLED_NAMES_ -MODOBJS= _MODOBJS_ +# filter out duplicate object files (_math.o) +MODOBJS= $(sort _MODOBJS_) MODLIBS= _MODLIBS_ # === Variables set by configure @@ -621,8 +622,9 @@ pybuilddir.txt: $(BUILDPYTHON) fi # This is shared by the math and cmath modules +# don't build with -fPIC when building as math and cmath as builtins Modules/_math.o: Modules/_math.c Modules/_math.h - $(CC) -c $(CCSHARED) $(PY_CORE_CFLAGS) -o $@ $< + $(CC) -c $(if $(findstring _math.o, $(MODOBJS)),,$(CCSHARED)) $(PY_CORE_CFLAGS) -o $@ $< # blake2s is auto-generated from blake2b $(srcdir)/Modules/_blake2/blake2s_impl.c: $(srcdir)/Modules/_blake2/blake2b_impl.c $(srcdir)/Modules/_blake2/blake2b2s.py -- 2.30.2