Issue #14928: Fix importlib bootstrap issues by using a custom executable (Modules/_freeze_importlib) to build Python/importlib.h.

1 files changed, 10 insertions, 1 deletions

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index d9eb5e7d9f..d9d2fdda81 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -242,7 +242,7 @@ import_init(PyInterpreterState *interp, PyObject *sysmod)
 
 
 void
-Py_InitializeEx(int install_sigs)
+_Py_InitializeEx_Private(int install_sigs, int install_importlib)
 {
     PyInterpreterState *interp;
     PyThreadState *tstate;
@@ -363,6 +363,9 @@ Py_InitializeEx(int install_sigs)
     /* Initialize _warnings. */
     _PyWarnings_Init();
 
+    if (!install_importlib)
+        return;
+
     import_init(interp, sysmod);
 
     _PyTime_Init();
@@ -393,6 +396,12 @@ Py_InitializeEx(int install_sigs)
 }
 
 void
+Py_InitializeEx(int install_sigs)
+{
+    _Py_InitializeEx_Private(install_sigs, 1);
+}
+
+void
 Py_Initialize(void)
 {
     Py_InitializeEx(1);