[runtimes] Only depend on builtins for same target

[smeenai]

Summary

We don't need to have built all the builtins before building the
runtimes for a particular target, only the builtins for that target.
While I'm here, rename the variable that stores the builtins dep to
something less generic than deps, to minimize the chances of
accidentally using a variable with the same name from an outer scope.

[smeenai]

Rebase to see if CI is happier

[phosek]

LGTM

llvm/runtimes/CMakeLists.txt

423

Super minor nit: I think that builtins_dep_name would be more consistent with other variables used in this file.

[smeenai]

Address comment

llvm/runtimes/CMakeLists.txt

foreach(target ${LLVM_BUILTIN_TARGETS})
       builtin_register_target(${compiler_rt_path} ${target}
         DEPENDS clang-resource-headers)
 
       add_dependencies(builtins builtins-${target})
       add_dependencies(install-builtins install-builtins-${target})
       add_dependencies(install-builtins-stripped install-builtins-${target}-stripped)
     endforeach()
   endif()
-  set(deps builtins)
+  set(builtins_dep builtins)
   # We don't need to depend on the builtins if we're building instrumented
   # because the next stage will use the same compiler used to build this stage.
   if(NOT LLVM_BUILD_INSTRUMENTED AND CLANG_ENABLE_BOOTSTRAP)
     add_dependencies(clang-bootstrap-deps builtins)
   endif()
 endif()
 
 # Create a list with the names of all the runtime projects in all uppercase and
if(TARGET opt)
       list(APPEND extra_deps opt)
     endif()
     if(TARGET llvm-link)
       list(APPEND extra_deps llvm-link)
     endif()
   endif()
   if(NOT LLVM_RUNTIME_TARGETS)
     runtime_default_target(
-      DEPENDS ${deps} ${extra_deps}
+      DEPENDS ${builtins_dep} ${extra_deps}
       PREFIXES ${prefixes})
     set(test_targets check-runtimes)
   else()
     if("default" IN_LIST LLVM_RUNTIME_TARGETS)
       runtime_default_target(
-        DEPENDS ${deps} ${extra_deps}
+        DEPENDS ${builtins_dep} ${extra_deps}
         PREFIXES ${prefixes})
       list(REMOVE_ITEM LLVM_RUNTIME_TARGETS "default")
     else()
       add_custom_target(runtimes)
       add_custom_target(runtimes-configure)
       add_custom_target(install-runtimes)
       add_custom_target(install-runtimes-stripped)
       if(LLVM_INCLUDE_TESTS)
else()
           add_custom_target(${component})
           add_custom_target(install-${component})
           add_custom_target(install-${component}-stripped)
         endforeach()
       endif()
     endif()
 
     foreach(name ${LLVM_RUNTIME_TARGETS})
+      if(builtins_dep)
+        set(name_builtins_dep "${builtins_dep}-${name}")
+      endif()
       runtime_register_target(${name} ${name}
-        DEPENDS ${deps})
+        DEPENDS ${name_builtins_dep})
 
       add_dependencies(runtimes runtimes-${name})
       add_dependencies(runtimes-configure runtimes-${name}-configure)
       add_dependencies(install-runtimes install-runtimes-${name})
       add_dependencies(install-runtimes-stripped install-runtimes-${name}-stripped)
       if(LLVM_INCLUDE_TESTS)
         add_dependencies(check-runtimes check-runtimes-${name})
         add_dependencies(runtimes-test-depends runtimes-test-depends-${name})