fixup! tc-build: Introduce '--multicall'

Signed-off-by: Nathan Chancellor <nathan@kernel.org>

Author: nathanchance

tc_build/llvm.py

@@ -403,6 +403,23 @@ def host_target(self):
     def host_target_is_enabled(self):
         return 'all' in self.targets or self.host_target() in self.targets
 
+    def llvm_driver_binaries(self, project):
+        # Find all CMakeLists.txt for LLVM or clang tools that have multicall driver support
+        cmakelists_txts = [
+            ''.join(cmakelists_txt)
+            for path in Path(self.folders.source, project).glob('tools/*/CMakeLists.txt')
+            if '  GENERATE_DRIVER' in (cmakelists_txt := path.read_text(encoding='utf-8'))
+        ]
+        skip_tools = (
+            # llvm-mt depends on libxml2, which we explicitly do not link against
+            'llvm-mt', )
+        # Return the values of the add_clang_tool() or add_llvm_tool() CMake macros
+        return [
+            tool for cmakelists_txt in cmakelists_txts
+            if (match := re.search(r"^add_(?:clang|llvm)_tool\((.*)$", cmakelists_txt, flags=re.M))
+            and (tool := match.groups()[0]) not in skip_tools
+        ]
+
     def multicall_is_enabled(self):
         return self.cmake_defines.get('LLVM_TOOL_LLVM_DRIVER_BUILD', 'OFF') == 'ON'
 
@@ -522,30 +539,13 @@ def configure(self):
             # slight increase in installation size due to being a multicall
             # binary.
             if self.multicall_is_enabled():
-                distribution_components += [
-                    'dsymutil',
-                    'llvm-cgdata',
-                    'llvm-cxxfilt',
-                    'llvm-debuginfod',
-                    'llvm-debuginfod-find',
-                    'llvm-dwp',
-                    'llvm-gsymutil',
-                    'llvm-ifs',
-                    'llvm-libtool-darwin',
-                    'llvm-lipo',
-                    'llvm-ml',
-                    'llvm-rc',
-                    'llvm-readobj',
-                    'llvm-size',
-                    'llvm-symbolizer',
-                    'sancov',
-                ]
+                distribution_components += [item for item in self.llvm_driver_binaries('llvm') if item not in distribution_components]
         if self.project_is_enabled('bolt'):
             distribution_components.append('bolt')
         if self.project_is_enabled('clang'):
             distribution_components += ['clang', 'clang-resource-headers']
             if self.multicall_is_enabled():
-                distribution_components += ['clang-installapi', 'clang-scan-deps']
+                distribution_components += [item for item in self.llvm_driver_binaries('clang') if item not in distribution_components]
         if self.project_is_enabled('lld'):
             distribution_components.append('lld')
         if build_compiler_rt: