closes bpo-34212: Build core extension modules with Py_BUILD_CORE_BUILTIN. (GH-8712)

(cherry picked from commit da324d53d420347344236ff64cf5eb9b675d6f86)

Co-authored-by: E. M. Bray <erik.m.bray@gmail.com>

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 4c23c0e4114a064302e77d40001ecaedd1e93c3d..afbc8f8c9bea7f08839e1fe1194158f97a150334 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -107,6 +107,7 @@ ARFLAGS=    @ARFLAGS@
 CFLAGSFORSHARED=@CFLAGSFORSHARED@
 # C flags used for building the interpreter object files
 PY_STDMODULE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARED)
+PY_BUILTIN_MODULE_CFLAGS= $(PY_STDMODULE_CFLAGS) -DPy_BUILD_CORE_BUILTIN
 PY_CORE_CFLAGS=        $(PY_STDMODULE_CFLAGS) -DPy_BUILD_CORE
 # Strict or non-strict aliasing flags used to compile dtoa.c, see above
 CFLAGS_ALIASING=@CFLAGS_ALIASING@

diff --git a/Modules/makesetup b/Modules/makesetup
index 020b19938c48663decedefe765f56a2783cbf220..eac97ad1346c06ac06824c5016c040cce89a73c8 100755 (executable)
--- a/Modules/makesetup
+++ b/Modules/makesetup
@@ -233,7 +233,7 @@ sed -e 's/[         ]*#.*//' -e '/^[        ]*$/d' |
                        case $doconfig in
                        no)     cc="$cc \$(CCSHARED) \$(PY_CFLAGS) \$(PY_CPPFLAGS)";;
                        *)
-                               cc="$cc \$(PY_STDMODULE_CFLAGS)";;
+                               cc="$cc \$(PY_BUILTIN_MODULE_CFLAGS)";;
                        esac
                        rule="$obj: $src; $cc $cpps -c $src -o $obj"
                        echo "$rule" >>$rulesf