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

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

Author: nathanchance

tc_build/llvm.py

@@ -622,13 +622,16 @@ def __init__(self):
         self.cmake_defines['LLVM_BUILD_RUNTIME'] = 'OFF'
 
     def configure(self):
+        no_multicall = not self.multicall_is_enabled()
         # The following defines are needed to avoid thousands of warnings
         # along the lines of:
         # "Unable to track new values: Running out of static counters."
-        # They require LLVM_LINK_DYLIB to be enabled, which is done above.
+        # LLVM_VP_COUNTERS_PER_SITE requires LLVM_LINK_DYLIB, which is only
+        # done when multicall is not enabled. If multicall is enabled, we need
+        # to use CMAKE_C{,XX}_FLAGS.
         cmake_options = Path(self.folders.source, 'llvm/cmake/modules/HandleLLVMOptions.cmake')
         cmake_text = cmake_options.read_text(encoding='utf-8')
-        if 'LLVM_VP_COUNTERS_PER_SITE' in cmake_text:
+        if no_multicall and 'LLVM_VP_COUNTERS_PER_SITE' in cmake_text:
             self.cmake_defines['LLVM_VP_COUNTERS_PER_SITE'] = '6'
         else:
             cflags = []
@@ -655,7 +658,7 @@ def configure(self):
         # https://github.com/llvm/llvm-project/pull/133596
         # But that should not matter much in this case because multicall uses
         # much less disk space.
-        if not self.multicall_is_enabled():
+        if no_multicall:
             self.cmake_defines['LLVM_LINK_LLVM_DYLIB'] = 'ON'
 
         super().configure()