From b6625765cf0ce4642e2e9fc7e82cd28fbb500033 Mon Sep 17 00:00:00 2001
From: Carlos Alberto Enciso <carlos.alberto.enciso@gmail.com>
Date: Tue, 18 Oct 2022 12:02:36 +0100
Subject: [PATCH] [llvm-debuginfo-analyzer] Fix linking errors in buildbots.

The tool used the 'old' LLVM build information (LLVMBuild.txt),
which caused linking errors in:

https://lab.llvm.org/buildbot/#/builders/177/builds/10125
https://lab.llvm.org/buildbot/#/builders/196/builds/19699

Update the CMake configuration to support the new LLVM build
system that uses only CMakeLists.txt.

Reviewed By: jryans

Differential Revision: https://reviews.llvm.org/D136159
---
 llvm/lib/DebugInfo/LogicalView/CMakeLists.txt | 18 ++++++------------
 llvm/lib/DebugInfo/LogicalView/LLVMBuild.txt  | 21 ---------------------
 2 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 llvm/lib/DebugInfo/LogicalView/LLVMBuild.txt

diff --git a/llvm/lib/DebugInfo/LogicalView/CMakeLists.txt b/llvm/lib/DebugInfo/LogicalView/CMakeLists.txt
index dbdfa03..783b62c 100644
--- a/llvm/lib/DebugInfo/LogicalView/CMakeLists.txt
+++ b/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 @@ list(APPEND LIBLV_ADDITIONAL_HEADER_DIRS
   "${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
   )
diff --git a/llvm/lib/DebugInfo/LogicalView/LLVMBuild.txt b/llvm/lib/DebugInfo/LogicalView/LLVMBuild.txt
deleted file mode 100644
index 11037f0..0000000
--- a/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
-- 
2.7.4