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

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

Author: nathanchance

tc_build/llvm.py

@@ -513,10 +513,39 @@ def configure(self):
                 'llvm-readelf',
                 'llvm-strip',
             ]
+            # If multicall is enabled, we need to add all possible tools to the
+            # distribution components list to prevent them from being built as
+            # standalone tools, which may break the build for tools like
+            # llvm-symbolizer because they need LLVMDebuginfod but it is not
+            # linked in that configuration. While this does build a little more
+            # code for the 'distribution' target, it should result in only a
+            # 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',
+                ]
         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']
         if self.project_is_enabled('lld'):
             distribution_components.append('lld')
         if build_compiler_rt: