Support old sysconfig versions

Author: vstinner

Lib/test/test_tools/test_getbuildinfo.py

@@ -70,37 +70,37 @@ def test_get_build_info(self):
     def test_get_compiler(self):
         getcompiler = os.path.join('Programs', '_getcompiler')
         MOCK_COMPILER = 'MOCK_COMPILER'
+        CC = 'gcc -std=c11'
 
         for hostrunner in ('', 'node'):
-            makefile_vars = {
-                'HOSTRUNNER': hostrunner,
-                'CC': 'gcc -std=c11',
-            }
             for use_cc in (False, True):
-                with mock.patch.object(generate_getbuildinfo,
-                                       'get_makefile_vars',
-                                       return_value=makefile_vars):
-                    with mock.patch.object(generate_getbuildinfo,
-                                           'run_command') as mock_run_command:
-                        if use_cc:
-                            mock_run_command.side_effect = ('', MOCK_COMPILER)
-                        else:
-                            mock_run_command.return_value = MOCK_COMPILER
-                        compiler = generate_getbuildinfo._get_compiler()
-                        self.assertEqual(compiler, MOCK_COMPILER)
-                        if hostrunner:
-                            cmd = [hostrunner, getcompiler]
-                        else:
-                            cmd = [getcompiler]
-                        if use_cc:
-                            self.assertEqual(mock_run_command.call_args_list,
-                                [
-                                    mock.call(cmd, check=False),
-                                    mock.call(['gcc', '-std=c11', '--version'], check=False),
-                                ]
-                            )
-                        else:
-                            mock_run_command.assert_called_once_with(cmd, check=False)
+                with (mock.patch.object(generate_getbuildinfo,
+                                       'get_hostrunner',
+                                       return_value=hostrunner),
+                     mock.patch.object(generate_getbuildinfo,
+                                       'get_makefile_cc',
+                                       return_value=CC),
+                     mock.patch.object(generate_getbuildinfo,
+                                       'run_command') as mock_run_command):
+                    if use_cc:
+                        mock_run_command.side_effect = ('', MOCK_COMPILER)
+                    else:
+                        mock_run_command.return_value = MOCK_COMPILER
+                    compiler = generate_getbuildinfo._get_compiler()
+                    self.assertEqual(compiler, MOCK_COMPILER)
+                    if hostrunner:
+                        cmd = [hostrunner, getcompiler]
+                    else:
+                        cmd = [getcompiler]
+                    if use_cc:
+                        self.assertEqual(mock_run_command.call_args_list,
+                            [
+                                mock.call(cmd, check=False),
+                                mock.call(['gcc', '-std=c11', '--version'], check=False),
+                            ]
+                        )
+                    else:
+                        mock_run_command.assert_called_once_with(cmd, check=False)
 
     def test_compact_compiler(self):
         get_compiler = generate_getbuildinfo.get_compiler

Tools/build/generate_getbuildinfo.py

@@ -7,7 +7,7 @@
 import shlex
 import subprocess
 import sys
-import sysconfig.__main__
+import sysconfig
 import time
 
 SRC_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
@@ -17,6 +17,13 @@
 # Get PY_VERSION from Include/patchlevel.h
 PY_VERSION_REGEX = re.compile(r'^#define PY_VERSION +"(.*)"$', re.MULTILINE)
 
+def create_makefile_regex(name):
+    return re.compile(fr'^{name}[ \t]*=[ \t]*(.*)$', re.MULTILINE)
+
+# Get HOSTRUNNER and CC from Makefile
+HOSTRUNNER_REGEX = create_makefile_regex('HOSTRUNNER')
+CC_REGEX = create_makefile_regex('CC')
+
 # Parse Clang version (truncated examples using '...'):
 # 'Clang 21.0.0 (clang-2100.1.1.101)'
 # 'clang version 18.0.4'
@@ -48,10 +55,27 @@ def get_py_version():
     return match.group(1)
 
 
-def get_makefile_vars():
+def parse_file(variable_name, filename, regex):
+    with open(filename, encoding='utf8') as fp:
+        code = fp.read()
+    match = regex.search(code)
+    if not match:
+        exit_error(f"ERROR: Unable to locate {variable_name} in {filename}")
+    return match.group(1)
+
+
+def get_hostrunner():
+    # Look in the current working directory
+    makefile = 'Makefile'
+    HOSTRUNNER = parse_file('HOSTRUNNER', makefile, HOSTRUNNER_REGEX)
+    return HOSTRUNNER.rstrip()
+
+
+def get_makefile_cc():
     # Look in the current working directory
     makefile = 'Makefile'
-    return sysconfig.__main__._parse_makefile(makefile)
+    CC = parse_file('CC', makefile, CC_REGEX)
+    return CC.rstrip()
 
 
 def get_gil_disabled():
@@ -131,11 +155,9 @@ def run_command(cmd, *, check=True):
 
 
 def _get_compiler():
-    makefile_vars = get_makefile_vars()
-
     # Run _getcompiler program
     getcompiler = os.path.join('Programs', '_getcompiler')
-    HOSTRUNNER = makefile_vars.get('HOSTRUNNER')
+    HOSTRUNNER = get_hostrunner()
     if HOSTRUNNER:
         # Cross-compilation
         runner = shlex.split(HOSTRUNNER)[0]
@@ -146,7 +168,7 @@ def _get_compiler():
         return compiler
 
     # Running _getcompiler failed, run the compiler with --version
-    CC = makefile_vars.get('CC')
+    CC = get_makefile_cc()
     if not CC:
         exit_error(f"ERROR: Unable to locate CC in Makefile")