From aa93603ff6a4bfd92c64e4f75d60ae9c84d5cdf5 Mon Sep 17 00:00:00 2001 From: Shoaib Meenai Date: Sat, 12 Jun 2021 19:47:09 -0700 Subject: [PATCH] [runtimes] Fix umbrella component targets When we're building the runtimes for multiple platform targets, we create umbrella build targets for each distribution component, but those targets didn't have any dependencies and were just no-ops. Make the umbrella target depend on the sub-targets for each platform to fix this, which is consistent with the behavior of the umbrella targets for each runtime, and also consistent with the behavior when we've only specified the default target. --- llvm/runtimes/CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt index 07a438bf581c..6ae087ef62dd 100644 --- a/llvm/runtimes/CMakeLists.txt +++ b/llvm/runtimes/CMakeLists.txt @@ -401,6 +401,11 @@ if(runtimes) add_dependencies(install-${runtime_name} install-${runtime_name}-${name}) add_dependencies(install-${runtime_name}-stripped install-${runtime_name}-${name}-stripped) endforeach() + foreach(component ${LLVM_RUNTIME_DISTRIBUTION_COMPONENTS}) + add_dependencies(${component} ${component}-${name}) + add_dependencies(install-${component} install-${component}-${name}) + add_dependencies(install-${component}-stripped install-${component}-${name}-stripped) + endforeach() endforeach() foreach(multilib ${LLVM_RUNTIME_MULTILIBS}) @@ -418,6 +423,11 @@ if(runtimes) add_dependencies(install-${runtime_name} install-${runtime_name}-${name}+${multilib}) add_dependencies(install-${runtime_name}-stripped install-${runtime_name}-${name}+${multilib}-stripped) endforeach() + foreach(component ${LLVM_RUNTIME_DISTRIBUTION_COMPONENTS}) + add_dependencies(${component} ${component}-${name}+${multilib}) + add_dependencies(install-${component} install-${component}-${name}+${multilib}) + add_dependencies(install-${component}-stripped install-${component}-${name}+${multilib}-stripped) + endforeach() endforeach() endforeach() endif()