diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 50b0469867c1a4e..6fe5a4aa1cc6727 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -549,9 +549,17 @@ jobs: run: | "$BUILD_DIR/host-python/bin/python3" -m test test_sysconfig test_site test_embed - name: Configure cross build - run: ./configure --prefix="$BUILD_DIR/cross-python" --with-build-python="$BUILD_DIR/host-python/bin/python3" + run: | + # Exercise a native build whose builtin modules differ from the build Python. + echo '_bisect _bisectmodule.c' > Modules/Setup.local + ./configure --prefix="$BUILD_DIR/cross-python" --with-build-python="$BUILD_DIR/host-python/bin/python3" - name: Install cross Python run: make -j8 install + - name: Check native extension modules with a build Python + run: | + "$BUILD_DIR/host-python/bin/python3" -c "import sys; assert '_bisect' not in sys.builtin_module_names" + "$BUILD_DIR/cross-python/bin/python3" -c "import _bisect, sys; assert '_bisect' in sys.builtin_module_names" + PYTHONSTRICTEXTENSIONBUILD=1 _PYTHON_HOST_PLATFORM=linux-x86_64 make checksharedmods - name: Display build info run: | "$BUILD_DIR/cross-python/bin/python3" -m test.pythoninfo diff --git a/Makefile.pre.in b/Makefile.pre.in index 650838d68286c73..92605e55d905821 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -332,6 +332,7 @@ HOSTRUNNER= @HOSTRUNNER@ PYTHON_FOR_REGEN?=@PYTHON_FOR_REGEN@ UPDATE_FILE=$(PYTHON_FOR_REGEN) $(srcdir)/Tools/build/update_file.py PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ +MODULE_CHECK_COMMAND=@MODULE_CHECK_COMMAND@ # Single-platform builds depend on $(BUILDPYTHON). Cross builds use an # external "build Python" and have an empty PYTHON_FOR_BUILD_DEPS. PYTHON_FOR_BUILD_DEPS=@PYTHON_FOR_BUILD_DEPS@ @@ -1605,11 +1606,11 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt .PHONY: checksharedmods checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) @if [ -n "@MISSING_STDLIB_CONFIG@" ]; then \ - $(RUNSHARED_FOR_BUILD) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py --generate-missing-stdlib-info --with-missing-stdlib-config="@MISSING_STDLIB_CONFIG@"; \ + $(RUNSHARED) $(MODULE_CHECK_COMMAND) --generate-missing-stdlib-info --with-missing-stdlib-config="@MISSING_STDLIB_CONFIG@"; \ else \ - $(RUNSHARED_FOR_BUILD) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py --generate-missing-stdlib-info; \ + $(RUNSHARED) $(MODULE_CHECK_COMMAND) --generate-missing-stdlib-info; \ fi - @$(RUNSHARED_FOR_BUILD) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py + @$(RUNSHARED) $(MODULE_CHECK_COMMAND) .PHONY: rundsymutil rundsymutil: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) diff --git a/Misc/NEWS.d/next/Build/2026-11-06-12-00-00.gh-issue-140266.K3hP9z.rst b/Misc/NEWS.d/next/Build/2026-11-06-12-00-00.gh-issue-140266.K3hP9z.rst new file mode 100644 index 000000000000000..399aca8a9bcff6c --- /dev/null +++ b/Misc/NEWS.d/next/Build/2026-11-06-12-00-00.gh-issue-140266.K3hP9z.rst @@ -0,0 +1,3 @@ +Fix ``"platform": ""`` in ``build-details.json`` for native builds configured +with :option:`--with-build-python`: :envvar:`!_PYTHON_HOST_PLATFORM` is now +only passed to the build interpreter when cross compiling. diff --git a/Misc/NEWS.d/next/Build/2026-11-20-16-30-00.gh-issue-162308.Mk7pQ2.rst b/Misc/NEWS.d/next/Build/2026-11-20-16-30-00.gh-issue-162308.Mk7pQ2.rst new file mode 100644 index 000000000000000..90a734551591f83 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2026-11-20-16-30-00.gh-issue-162308.Mk7pQ2.rst @@ -0,0 +1,4 @@ +Use the newly built interpreter to check extension modules in native builds +configured with :option:`--with-build-python`. This also applies when +generating missing standard library module information. Cross builds continue +to use the build interpreter without importing target extension modules. diff --git a/configure b/configure index 0e93826d3494c6d..fdcc7206c93c90f 100755 --- a/configure +++ b/configure @@ -1042,6 +1042,7 @@ FREEZE_MODULE FREEZE_MODULE_BOOTSTRAP_DEPS FREEZE_MODULE_BOOTSTRAP PYTHON_FOR_FREEZE +MODULE_CHECK_COMMAND PYTHON_FOR_BUILD host_os host_vendor @@ -3830,7 +3831,12 @@ fi fi ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python PYTHON_FOR_FREEZE="$with_build_python" - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) _PYTHON_SYSCONFIGDATA_PATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`) '$with_build_python + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) PYTHONPATH=$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) _PYTHON_SYSCONFIGDATA_PATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`) '$with_build_python + if test "x$cross_compiling" = xyes +then : + PYTHON_FOR_BUILD='_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) '"$PYTHON_FOR_BUILD" + +fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_build_python" >&5 printf "%s\n" "$with_build_python" >&6; } @@ -3850,6 +3856,17 @@ fi +# Module import checks must run with the target interpreter on native builds. +if test "x$cross_compiling" = xyes +then : + MODULE_CHECK_COMMAND='$(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py --cross-compiling' +else case e in #( + e) MODULE_CHECK_COMMAND='./$(BUILDPYTHON) -E $(srcdir)/Tools/build/check_extension_modules.py --no-cross-compiling' + ;; +esac +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Python interpreter freezing" >&5 printf %s "checking for Python interpreter freezing... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON_FOR_FREEZE" >&5 diff --git a/configure.ac b/configure.ac index 234e2fbc920822f..214f2cc74d8a2be 100644 --- a/configure.ac +++ b/configure.ac @@ -170,7 +170,11 @@ AC_ARG_WITH([build-python], dnl Build Python interpreter is used for regeneration and freezing. ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python PYTHON_FOR_FREEZE="$with_build_python" - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) _PYTHON_SYSCONFIGDATA_PATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`) '$with_build_python + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) PYTHONPATH=$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) _PYTHON_SYSCONFIGDATA_PATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`) '$with_build_python + dnl _PYTHON_HOST_PLATFORM is only set when cross compiling. + AS_VAR_IF([cross_compiling], [yes], + [PYTHON_FOR_BUILD='_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) '"$PYTHON_FOR_BUILD"] + ) AC_MSG_RESULT([$with_build_python]) ], [ AS_VAR_IF([cross_compiling], [yes], @@ -182,6 +186,13 @@ AC_ARG_WITH([build-python], ) AC_SUBST([PYTHON_FOR_BUILD]) +# Module import checks must run with the target interpreter on native builds. +AS_VAR_IF([cross_compiling], [yes], + [MODULE_CHECK_COMMAND='$(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py --cross-compiling'], + [MODULE_CHECK_COMMAND='./$(BUILDPYTHON) -E $(srcdir)/Tools/build/check_extension_modules.py --no-cross-compiling'] +) +AC_SUBST([MODULE_CHECK_COMMAND]) + AC_MSG_CHECKING([for Python interpreter freezing]) AC_MSG_RESULT([$PYTHON_FOR_FREEZE]) AC_SUBST([PYTHON_FOR_FREEZE])