[llvm-branch-commits] [llvm] 1de56d6 - [llvmbuildectomy] Also include component groups in llvm-config --components list

[via llvm-branch-commits]

Author: Mariusz Ceier
Date: 2020-11-26T21:05:56+01:00
New Revision: 1de56d6d13c083c996dfd44a32041dacae037d66

URL: https://github.com/llvm/llvm-project/commit/1de56d6d13c083c996dfd44a32041dacae037d66
DIFF: https://github.com/llvm/llvm-project/commit/1de56d6d13c083c996dfd44a32041dacae037d66.diff

LOG: [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

Added: 
    

Modified: 
    llvm/cmake/modules/LLVM-Build.cmake

Removed: 
    


################################################################################
diff  --git a/llvm/cmake/modules/LLVM-Build.cmake b/llvm/cmake/modules/LLVM-Build.cmake
index ce56273c5a1d..525186cbbb19 100644
--- 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)