[PATCH] D74588: Use DISABLE_LLVM_LINK_LLVM_DYLIB for TableGenTests

Chris Bieneman via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Tue Mar 30 08:56:20 PDT 2021


beanz added a comment.

In D74588#2658766 <https://reviews.llvm.org/D74588#2658766>, @aaronpuchert wrote:

> So apparently we do import the `LLVM` dependency from `LLVMTableGenGlobalISel `.

Yep, and that's because of a different bug in how LLVMTableGenGlobalISel was setup.

This patch would address the issues:

  diff --git a/llvm/utils/TableGen/CMakeLists.txt b/llvm/utils/TableGen/CMakeLists.txt
  index 9e918852b1c0..c05252a756ce 100644
  --- a/llvm/utils/TableGen/CMakeLists.txt
  +++ b/llvm/utils/TableGen/CMakeLists.txt
  @@ -1,6 +1,6 @@
   add_subdirectory(GlobalISel)
   
  -set(LLVM_LINK_COMPONENTS Support)
  +set(LLVM_LINK_COMPONENTS Support TableGenGlobalISel)
   
   add_tablegen(llvm-tblgen LLVM
     AsmMatcherEmitter.cpp
  @@ -57,5 +57,4 @@ add_tablegen(llvm-tblgen LLVM
     WebAssemblyDisassemblerEmitter.cpp
     CTagsEmitter.cpp
     )
  -target_link_libraries(llvm-tblgen PRIVATE LLVMTableGenGlobalISel)
   set_target_properties(llvm-tblgen PROPERTIES FOLDER "Tablegenning")
  diff --git a/llvm/utils/TableGen/GlobalISel/CMakeLists.txt b/llvm/utils/TableGen/GlobalISel/CMakeLists.txt
  index c23ef6742f32..5c97e66c8a33 100644
  --- a/llvm/utils/TableGen/GlobalISel/CMakeLists.txt
  +++ b/llvm/utils/TableGen/GlobalISel/CMakeLists.txt
  @@ -3,7 +3,7 @@ set(LLVM_LINK_COMPONENTS
     TableGen
     )
   
  -add_llvm_library(LLVMTableGenGlobalISel STATIC DISABLE_LLVM_LINK_LLVM_DYLIB
  +add_llvm_component_library(LLVMTableGenGlobalISel STATIC
                    CodeExpander.cpp
                    GIMatchDag.cpp
                    GIMatchDagEdge.cpp


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D74588/new/

https://reviews.llvm.org/D74588



More information about the llvm-commits mailing list