Page MenuHomePhabricator

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

Authored by mceier on Nov 26 2020, 12:47 AM.

Details

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.

Diff Detail

Event Timeline

mceier created this revision.Nov 26 2020, 12:47 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 26 2020, 12:47 AM
mceier requested review of this revision.Nov 26 2020, 12:47 AM

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

llvm/cmake/modules/LLVM-Build.cmake
13–14

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

mceier updated this revision to Diff 307782.Nov 26 2020, 1:03 AM

Renamed llvm_target_to_build to llvm_component

mceier marked an inline comment as done.Nov 26 2020, 1:04 AM

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

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.

This revision is now accepted and ready to land.Nov 26 2020, 11:57 AM

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).