[llvmbuildectomy] Also include component groups in llvm-config --components list

Without this change mesa fails while looking for llvm components like amdgpu, engine or native:

    Run-time dependency LLVM (modules: amdgpu(missing), bitreader, bitwriter, core, engine(missing), executionengine, instcombine, ipo, mcdisassembler, mcjit, native(missing), scalaropts, transformutils, coroutines)
    Looking for a fallback subproject for the dependency llvm (modules: bitwriter, engine, mcdisassembler, mcjit, core, executionengine, scalaropts, transformutils, instcombine, amdgpu, native, bitreader, ipo)

This change adds component groups (like all-targets, engine, native, amdgpu) to the "all" component.

Differential Revision: https://reviews.llvm.org/D92158

diff --git a/llvm/cmake/modules/LLVM-Build.cmake b/llvm/cmake/modules/LLVM-Build.cmake
index ce56273..525186c 100644 (file)
--- a/llvm/cmake/modules/LLVM-Build.cmake
+++ b/llvm/cmake/modules/LLVM-Build.cmake
@@ -11,12 +11,9 @@ function(LLVMBuildGenerateCFragment)
     list(APPEND all_component_libdeps ${component_name})
   endforeach()
   list(APPEND llvmbuild_components all)
-  list(APPEND llvmbuild_components all-targets)
-  list(APPEND llvmbuild_components Engine)
-  list(APPEND llvmbuild_components Native)
-  list(APPEND llvmbuild_components NativeCodeGen)
-  foreach(llvm_target_to_build ${LLVM_TARGETS_TO_BUILD})
-    list(APPEND llvmbuild_components ${llvm_target_to_build})
+  foreach(llvm_component all-targets Engine Native NativeCodeGen ${LLVM_TARGETS_TO_BUILD})
+    list(APPEND llvmbuild_components ${llvm_component})
+    list(APPEND all_component_libdeps ${llvm_component})
   endforeach()
 
   list(LENGTH llvmbuild_components llvmbuild_components_size)