Index: llvm/lib/DebugInfo/LogicalView/CMakeLists.txt
===================================================================
--- llvm/lib/DebugInfo/LogicalView/CMakeLists.txt
+++ llvm/lib/DebugInfo/LogicalView/CMakeLists.txt
@@ -1,14 +1,3 @@
-set(LLVM_LINK_COMPONENTS
-  BinaryFormat
-  DebugInfoDWARF
-  DebugInfoCodeView
-  DebugInfoPDB
-  Demangle
-  MC
-  Object
-  Support
-  )
-
 macro(add_lv_impl_folder group)
   list(APPEND LV_IMPL_SOURCES ${ARGN})
   source_group(${group} FILES ${ARGN})
@@ -23,9 +12,14 @@
   "${LLVM_MAIN_INCLUDE_DIR}/llvm/DebugInfo/LogicalView/Core"
   )
 
-add_llvm_library(LLVMDebugInfoLogicalView
+add_llvm_component_library(LLVMDebugInfoLogicalView
   ${LV_IMPL_SOURCES}
 
   ADDITIONAL_HEADER_DIRS
   ${LIBLV_ADDITIONAL_HEADER_DIRS}
+
+  LINK_COMPONENTS
+  Object
+  MC
+  Support
   )
Index: llvm/lib/DebugInfo/LogicalView/LLVMBuild.txt
===================================================================
--- llvm/lib/DebugInfo/LogicalView/LLVMBuild.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-;===- ./lib/DebugInfo/LogicalView/LLVMBuild.txt ----------------*- Conf -*--===;
-;
-; Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-; See https://llvm.org/LICENSE.txt for license information.
-; SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-;
-;===------------------------------------------------------------------------===;
-;
-; This is an LLVMBuild description file for the components in this subdirectory.
-;
-; For more information on the LLVMBuild system, please see:
-;
-;   http://llvm.org/docs/LLVMBuild.html
-;
-;===------------------------------------------------------------------------===;
-
-[component_0]
-type = Library
-name = DebugInfoLogicalView
-parent = DebugInfo
-required_libraries = Object Support DebugInfoDWARF DebugInfoCodeView DebugInfoPDB