Also include component groups in llvm-config --components list

[mceier]

Summary

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.

[serge-sans-paille]

We already discussed this change on IRC, I'm fine with it, once the suggested renaming is done.

llvm/cmake/modules/LLVM-Build.cmake

14

llvm_target_to_build is probably no longer a valid name here, probably just use llvm_component

[mceier]

Renamed llvm_target_to_build to llvm_component

[serge-sans-paille]

I'm going to run a bunch of tests with different configuration before accepting :-)

[serge-sans-paille]

Compiles fine with

cmake ../llvm -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DLLVM_LINK_LLVM_DYLIB=OFF && make check-llvm -j30

cmake ../llvm -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DLLVM_LINK_LLVM_DYLIB=OFF && make check-llvm -j30

cmake ../llvm -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DLLVM_LINK_LLVM_DYLIB=ON && make check-llvm -j30

LGTM then.

[salerio-gs]

Any ideas how to fix this issue on the 9.x release? I have come across the exact same issue in a Yocto project build (Yocto dunfell version).

[serge-sans-paille]

I'm actually surprised llvm 9.x has the issue... the logic is probably in https://github.com/llvm/llvm-project/blob/release/9.x/llvm/utils/llvm-build/llvmbuild/main.py

llvm/cmake/modules/LLVM-Build.cmake

 # Generate C code in the file provided as OUTPUT that describes the properties
 # of all components. This C code is suitable for inclusion in `llvm-config`
 function(LLVMBuildGenerateCFragment)
   cmake_parse_arguments(ARG "" "OUTPUT" "" ${ARGN})
 
   # Write C header
   #################
   get_property(llvmbuild_components GLOBAL PROPERTY LLVM_COMPONENT_LIBS)
   foreach(llvmbuild_component ${llvmbuild_components})
     string(REGEX REPLACE "^LLVM" "" component_name ${llvmbuild_component})
     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})
+  foreach(llvm_target_to_build all-targets Engine Native NativeCodeGen ${LLVM_TARGETS_TO_BUILD})
     list(APPEND llvmbuild_components ${llvm_target_to_build})
+    list(APPEND all_component_libdeps ${llvm_target_to_build})
   endforeach()
 
   list(LENGTH llvmbuild_components llvmbuild_components_size)
   file(WRITE ${ARG_OUTPUT}
   "
   struct AvailableComponent {
     /// The name of the component.
     const char *Name;