diff --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt
--- a/llvm/test/CMakeLists.txt
+++ b/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")
 
diff --git a/llvm/test/lit.cfg.py b/llvm/test/lit.cfg.py
--- a/llvm/test/lit.cfg.py
+++ b/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'),
diff --git a/llvm/tools/CMakeLists.txt b/llvm/tools/CMakeLists.txt
--- a/llvm/tools/CMakeLists.txt
+++ b/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()