Revert "[bolt] Fix (part of) dylib compatibility"

serge-sans-paille · serge-sans-paille · commit 3ca61941c121 · 2022-09-22T10:41:21.000+02:00
This reverts commit 34ad83d.
diff --git a/bolt/lib/Target/AArch64/CMakeLists.txt b/bolt/lib/Target/AArch64/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(LLVM_LINK_COMPONENTS
+  BOLTCore
   MC
   Support
   AArch64Desc
@@ -11,8 +12,6 @@ add_llvm_library(LLVMBOLTTargetAArch64
   AArch64CommonTableGen
   )
 
-target_link_libraries(LLVMBOLTTargetAArch64 PRIVATE LLVMBOLTCore)
-
 include_directories(
   ${LLVM_MAIN_SRC_DIR}/lib/Target/AArch64
   ${LLVM_BINARY_DIR}/lib/Target/AArch64
diff --git a/bolt/lib/Target/X86/CMakeLists.txt b/bolt/lib/Target/X86/CMakeLists.txt
@@ -1,4 +1,6 @@
 set(LLVM_LINK_COMPONENTS
+  BOLTCore
+  BOLTUtils
   MC
   MCDisassembler
   Support
@@ -13,8 +15,6 @@ add_llvm_library(LLVMBOLTTargetX86
   X86CommonTableGen
   )
 
-target_link_libraries(LLVMBOLTTargetX86 PRIVATE LLVMBOLTCore LLVMBOLTUtils)
-
 include_directories(
   ${LLVM_MAIN_SRC_DIR}/lib/Target/X86
   ${LLVM_BINARY_DIR}/lib/Target/X86
diff --git a/bolt/tools/llvm-bolt-fuzzer/CMakeLists.txt b/bolt/tools/llvm-bolt-fuzzer/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(LLVM_LINK_COMPONENTS
+  BOLTRewrite
   ${LLVM_TARGETS_TO_BUILD}
   )
 
