Cleanup get_compiler() code

Author: vstinner

Tools/build/generate_getbuildinfo.py

@@ -125,7 +125,7 @@ def run_command(cmd, *, check=True):
     return proc.stdout.rstrip()
 
 
-def get_compiler():
+def _get_compiler():
     makefile_vars = get_makefile_vars()
 
     # Run _getcompiler program
@@ -151,9 +151,23 @@ def get_compiler():
         # Get the first line
         return output.splitlines()[0]
 
-    # Default compiler name when everything else failed
-    # (see Programs/_getcompiler.c)
-    return 'C'
+    return None
+
+
+def get_compiler(compiler):
+    if not compiler:
+        compiler = _get_compiler()
+    if not compiler:
+        # Default compiler name when everything else failed
+        # (see Programs/_getcompiler.c)
+        compiler = 'C'
+
+    # Make verbose Clang version shorter: strip the prefix and URL
+    match = CLANG_VERBOSE_VERSION.search(compiler)
+    if match:
+        compiler = match.group(1)
+
+    return f'[{compiler}]'
 
 
 def main():
@@ -166,7 +180,6 @@ def main():
     git_version = args.git_version
     git_tag = args.git_tag
     git_branch = args.git_branch
-    compiler = args.compiler
     free_threading = args.free_threading
 
     if not output_filename:
@@ -175,13 +188,7 @@ def main():
     if not platform:
         platform = "unknown"
 
-    if not compiler:
-        compiler = get_compiler()
-
-    # Make verbose Clang version shorter: strip the prefix and URL
-    match = CLANG_VERBOSE_VERSION.search(compiler)
-    if match:
-        compiler = match.group(1)
+    compiler = get_compiler(args.compiler)
 
     build_info, git_id = get_build_info(git_tag, git_branch, git_version)
 
@@ -192,9 +199,9 @@ def main():
         free_threading = get_gil_disable()
 
     if free_threading:
-        version = f"{PY_VERSION} free-threading build ({build_info}) [{compiler}]"
+        version = f"{PY_VERSION} free-threading build ({build_info}) {compiler}"
     else:
-        version = f"{PY_VERSION} ({build_info}) [{compiler}]"
+        version = f"{PY_VERSION} ({build_info}) {compiler}"
 
     new_filename = output_filename + ".new"
     with open(new_filename, "w", encoding="utf8") as fp:
@@ -204,7 +211,7 @@ def write_macro(name, value):
         print(f'// Header file auto-generated by {SCRIPT_FULLNAME}', file=fp)
         print(file=fp)
         write_macro('PLATFORM', platform)
-        write_macro('COMPILER', f'[{compiler}]')
+        write_macro('COMPILER', compiler)
         write_macro('GIT_VERSION', git_version)
         write_macro('GIT_IDENTIFIER', git_id)
         write_macro('BUILD_INFO', build_info)