diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -1471,16 +1471,25 @@
          'category': 'libc',
          'factory' : AnnotatedBuilder.getAnnotatedBuildFactory(
              script="libc-linux.py",
-             depends_on_projects=['llvm', 'libc'])},
+             depends_on_projects=['llvm', 'libc', 'clang', 'clang-tools-extra'])},
 
-        {'name': "libc-x86_64-debian-asan",
+        {'name': "libc-x86_64-debian-dbg",
          'slavenames': ["libc-x86_64-debian"],
-         'builddir': "libc-x86_64-debian-asan",
+         'builddir': "libc-x86_64-debian-dbg",
          'category' : 'libc',
          'factory' : AnnotatedBuilder.getAnnotatedBuildFactory(
              script="libc-linux.py",
-             depends_on_projects=['llvm', 'libc'],
-             extra_args=['--asan'])},
+             depends_on_projects=['llvm', 'libc', 'clang', 'clang-tools-extra'],
+             extra_args=['--debug'])},
+
+        {'name': "libc-x86_64-debian-dbg-asan",
+         'slavenames': ["libc-x86_64-debian"],
+         'builddir': "libc-x86_64-debian-dbg-asan",
+         'category' : 'libc',
+         'factory' : AnnotatedBuilder.getAnnotatedBuildFactory(
+             script="libc-linux.py",
+             depends_on_projects=['llvm', 'libc', 'clang', 'clang-tools-extra'],
+             extra_args=['--debug', '--asan'])},
     ]
 
 # Flang builders.
diff --git a/buildbot/osuosl/master/config/status.py b/buildbot/osuosl/master/config/status.py
--- a/buildbot/osuosl/master/config/status.py
+++ b/buildbot/osuosl/master/config/status.py
@@ -277,7 +277,8 @@
             extraRecipients = ["sivachandra@google.com", "paulatoth@google.com"],
             subject="Build %(builder)s Failure",
             mode = "failing",
-            builders = ["libc-x86_64-debian", "libc-x86_64_debian-asan"],
+            builders = ["libc-x86_64-debian", "libc-x86_64_debian-dbg",
+                        "libc-x86_64-debian-dbg-asan"],
             addLogs=False),
          InformativeMailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
diff --git a/zorg/buildbot/builders/annotated/libc-linux.py b/zorg/buildbot/builders/annotated/libc-linux.py
--- a/zorg/buildbot/builders/annotated/libc-linux.py
+++ b/zorg/buildbot/builders/annotated/libc-linux.py
@@ -13,6 +13,8 @@
     ap = argparse.ArgumentParser()
     ap.add_argument('--asan', action='store_true', default=False,
                     help='Build with address sanitizer enabled.')
+    ap.add_argument('--debug', action='store_true', default=False,
+                    help='Build in debug mode.')
     args, _ = ap.parse_known_args()
 
     source_dir = os.path.join('..', 'llvm-project')
@@ -20,9 +22,15 @@
     with step('cmake', halt_on_fail=True):
         projects = ['llvm', 'libc', 'clang', 'clang-tools-extra']
 
-        cmake_args = ['-GNinja', '-DCMAKE_BUILD_TYPE=Debug']
+        cmake_args = ['-GNinja']
+        if args.debug:
+            cmake_args.append('-DCMAKE_BUILD_TYPE=Debug')
+        else:
+            cmake_args.append('-DCMAKE_BUILD_TYPE=Release')
+
         if args.asan:
             cmake_args.append('-DLLVM_USE_SANITIZER=Address')
+
         cmake_args.append('-DLLVM_ENABLE_PROJECTS={}'.format(';'.join(projects)))
 
         run_command(['cmake', os.path.join(source_dir, 'llvm')] + cmake_args)