Support docs-libc-html for LLVM_ENABLE_RUNTIMES=libc

[MaskRay]

Summary

D126156 added a docs-libc-html target for LLVM_ENABLE_PROJECTS=libc, but our
bots use LLVM_ENABLE_RUNTIMES=libc.
This patch follows https://github.com/llvm/llvm-zorg/commit/a5243cfccbb955bc00a0934ead25d8f88e40296a for libcxx/libunwind
to support the LLVM_ENABLE_RUNTIMES=libc configuration.

[Endill]

LGTM

[MaskRay]

Add libc to getLLVMRuntimesDocsBuildFactory as well..

Unfortunately, I don't know how to test this script...

[MaskRay]

update summary

[MaskRay]

Closed by 11f82c360c7ec38a0c0a9b4d55779fd0fa6fca0a

[aaron.ballman]

In D153803#4450101, @MaskRay wrote:

Closed by 11f82c360c7ec38a0c0a9b4d55779fd0fa6fca0a

@gkistanova -- does something need to be done for the server to pick up this change? I'm getting a "sphinx publish failed" email every six minutes, so I'd really love to see this fixed. :-D

zorg/buildbot/builders/SphinxDocsBuilder.py

 from collections import OrderedDict
 
 from buildbot.steps.shell import ShellCommand
 
 from zorg.buildbot.builders import UnifiedTreeBuilder
 from zorg.buildbot.commands.CmakeCommand import CmakeCommand
 from zorg.buildbot.commands.NinjaCommand import NinjaCommand
 
 llvm_docs = OrderedDict([
   # Project              Build target             Local path                            Remote path
   ("llvm",              ("docs-llvm-html",        "docs/html/",                         "llvm")),
   ("clang",             ("docs-clang-html",       "tools/clang/docs/html/",             "cfe")),
   ("clang-tools-extra", ("docs-clang-tools-html", "tools/clang/tools/extra/docs/html/", "clang-tools-extra")),
-  ("libc",              ("docs-libc-html",        "projects/libc/docs/html/",           "libc")),
+  ("libc",              ("docs-libc-html",        "libc/docs/html/",                    "libc")),
   ("libcxx",            ("docs-libcxx-html",      "libcxx/docs/html/",                  "libcxx")),
   ("libunwind",         ("docs-libunwind-html",   "libunwind/docs/html/",               "libunwind")),
   ("lld",               ("docs-lld-html",         "tools/lld/docs/html/",               "lld")),
   ("lldb",              ("docs-lldb-html",        "tools/lldb/docs/html/",              "lldb")),
   ('flang',             ("docs-flang-html",       "tools/flang/docs/html/",             "flang")),
   ("openmp",            ("docs-openmp-html",      "projects/openmp/docs/html/",         "openmp")),
   ("polly",             ("docs-polly-html",       "tools/polly/docs/html/",             "polly")),
 ])
if polly_html:
                                targets=['docs-polly-html']
                               ))
 
     return f
 
 def getSphinxRuntimesDocsBuildFactory(
         libcxx_html       = False, # Build Libc++ HTML documentation
         libunwind_html    = False, # Build libunwind HTML documentation
+        libc_html         = False, # Build Libc HTML documentation
         extra_configure_args = None,
         **kwargs):
 
     if extra_configure_args:
         cmake_args = extra_configure_args[:]
     else:
         cmake_args = list()
 
CmakeCommand.applyDefaultOptions(cmake_args, [
       ])
 
     depends_on_runtimes = []
     if libcxx_html:
         depends_on_runtimes.append('libcxx')
         depends_on_runtimes.append('libcxxabi')
     if libunwind_html:
         depends_on_runtimes.append('libunwind')
+    if libc_html:
+        depends_on_runtimes.append('libc')
 
     f = UnifiedTreeBuilder.getLLVMBuildFactoryAndSourcecodeSteps(
             depends_on_projects=depends_on_runtimes,
             enable_runtimes=depends_on_runtimes,
             src_to_build_dir='runtimes',
             **kwargs) # Pass through all the extra arguments.
 
     UnifiedTreeBuilder.addCmakeSteps(
def getSphinxRuntimesDocsBuildFactory(
     if libunwind_html:
         f.addStep(NinjaCommand(name="docs-libunwind-html",
                                haltOnFailure=True,
                                description=["Build libunwind Sphinx HTML documentation"],
                                workdir=f.obj_dir,
                                targets=['docs-libunwind-html']
                               ))
 
+    if libc_html:
+        f.addStep(NinjaCommand(name="docs-libc-html",
+                               haltOnFailure=True,
+                               description=["Build libc Sphinx HTML documentation"],
+                               workdir=f.obj_dir,
+                               targets=['docs-libc-html']
+                              ))
+
     return f
 
 
 def getLLVMDocsBuildFactory(
         clean = False,
         depends_on_projects = None,
         extra_configure_args = None,
         env = None,
         **kwargs):
 
     if depends_on_projects is None:
         # All the projects by default.
         _depends_on_projects=[
             "llvm",
             "clang",
             "clang-tools-extra",
-            "libc",
             "lld",
             "lldb",
             "flang",
             "openmp",
             "polly",
         ]
     else:
         # Make a local copy of depends_on_projects, as we are going to modify
def getLLVMRuntimesDocsBuildFactory(
         **kwargs):
 
     if depends_on_runtimes is None:
         # All the projects by default.
         _depends_on_runtimes=[
             "libcxx",
             "libcxxabi",
             "libunwind",
+            "libc",
         ]
     else:
         # Make a local copy of depends_on_runtimes, as we are going to modify
         # that.
         _depends_on_runtimes=depends_on_runtimes[:]
         # Some runtimes are interdependent for the purpose of documentation.
         # Enforce the dependencies.
         if "libcxx" in _depends_on_runtimes and \