[PATCH] D147185: [Debuginfod][CMake] Don't build a defunct llvm-debuginfod

[Daniel Thornburgh via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG8ac330bde40e: [Debuginfod][CMake] Don't build a defunct llvm-debuginfod (authored by mysterymath).

Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D147185

Files:
  llvm/test/CMakeLists.txt
  llvm/test/lit.cfg.py
  llvm/tools/CMakeLists.txt


Index: llvm/tools/CMakeLists.txt
===================================================================
--- llvm/tools/CMakeLists.txt
+++ llvm/tools/CMakeLists.txt
@@ -21,6 +21,10 @@
   set(LLVM_TOOL_LTO_BUILD Off)
 endif()
 
+if(NOT LLVM_ENABLE_HTTPLIB)
+  set(LLVM_TOOL_LLVM_DEBUGINFOD_BUILD Off)
+endif()
+
 if (LLVM_TOOL_LLVM_DRIVER_BUILD)
   add_llvm_tool(llvm-driver)
 endif()
Index: llvm/test/lit.cfg.py
===================================================================
--- llvm/test/lit.cfg.py
+++ llvm/test/lit.cfg.py
@@ -158,7 +158,7 @@
 tools.extend([
     'dsymutil', 'lli', 'lli-child-target', 'llvm-ar', 'llvm-as',
     'llvm-addr2line', 'llvm-bcanalyzer', 'llvm-bitcode-strip', 'llvm-config',
-    'llvm-cov', 'llvm-cxxdump', 'llvm-cvtres', 'llvm-debuginfod-find', 'llvm-debuginfod',
+    'llvm-cov', 'llvm-cxxdump', 'llvm-cvtres', 'llvm-debuginfod-find',
     'llvm-debuginfo-analyzer',
     'llvm-diff', 'llvm-dis', 'llvm-dwarfdump', 'llvm-dwarfutil', 'llvm-dlltool',
     'llvm-exegesis', 'llvm-extract', 'llvm-isel-fuzzer', 'llvm-ifs',
@@ -176,6 +176,7 @@
 # The following tools are optional
 tools.extend([
     ToolSubst('llvm-mt', unresolved='ignore'),
+    ToolSubst('llvm-debuginfod', unresolved='ignore'),
     ToolSubst('Kaleidoscope-Ch3', unresolved='ignore'),
     ToolSubst('Kaleidoscope-Ch4', unresolved='ignore'),
     ToolSubst('Kaleidoscope-Ch5', unresolved='ignore'),
Index: llvm/test/CMakeLists.txt
===================================================================
--- llvm/test/CMakeLists.txt
+++ llvm/test/CMakeLists.txt
@@ -79,7 +79,6 @@
           llvm-cxxfilt
           llvm-cxxmap
           llvm-debuginfo-analyzer
-          llvm-debuginfod
           llvm-debuginfod-find
           llvm-diff
           llvm-dis
@@ -220,6 +219,10 @@
   list(APPEND LLVM_TEST_DEPENDS dxil-dis)
 endif()
 
+if(LLVM_ENABLE_HTTPLIB)
+  list(APPEND LLVM_TEST_DEPENDS llvm-debuginfod)
+endif()
+
 add_custom_target(llvm-test-depends DEPENDS ${LLVM_TEST_DEPENDS})
 set_target_properties(llvm-test-depends PROPERTIES FOLDER "Tests")
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D147185.509493.patch
Type: text/x-patch
Size: 2057 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230329/d00a8d10/attachment.bin>