Index: llvm/runtimes/CMakeLists.txt
===================================================================
--- llvm/runtimes/CMakeLists.txt
+++ llvm/runtimes/CMakeLists.txt
@@ -389,11 +389,9 @@
     endforeach()
 
     foreach(component ${LLVM_RUNTIME_DISTRIBUTION_COMPONENTS})
-      if(NOT "${target_name}:${target_name}-${component}" IN_LIST extra_targets)
-        list(APPEND ${name}_extra_targets
-          "${target_name}:${target_name}-${component}"
-          "${target_name}:${target_name}-install-${component}")
-      endif()
+      set(install-${component}-${name} ${component})
+      set(${component}-${name} ${component})
+      list(APPEND ${name}_extra_targets ${target_name}-install-${component} ${target_name}-${component})
     endforeach()
 
     if(LLVM_INCLUDE_TESTS)