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
@@ -1348,7 +1348,8 @@
                         'CMAKE_BUILD_TYPE': 'Release',
                         'CMAKE_C_COMPILER': 'gcc',
                         'CMAKE_CXX_COMPILER': 'g++',
-                        'CMAKE_AR': '/usr/bin/ar'})},
+                        'CMAKE_AR': '/usr/bin/ar'},
+                    build_standalone=True)},
 
     {'name': "fuchsia-x86_64-linux",
     'tags'  : ["toolchain"],
diff --git a/zorg/buildbot/builders/LibcxxAndAbiBuilder.py b/zorg/buildbot/builders/LibcxxAndAbiBuilder.py
--- a/zorg/buildbot/builders/LibcxxAndAbiBuilder.py
+++ b/zorg/buildbot/builders/LibcxxAndAbiBuilder.py
@@ -12,6 +12,7 @@
                            check_libcxx_benchmarks=None,
                            depends_on_projects=None,
                            use_cache=None,
+                           build_standalone=False.
                            **kwargs):
 
     if env is None:
@@ -26,7 +27,11 @@
     if depends_on_projects is None:
         depends_on_projects = ['libcxx','libcxxabi','libunwind']
 
-    src_root = 'llvm'
+    if build_standalone:
+        src_root = 'runtimes'
+    else:
+        src_root = 'llvm'
+
     build_path = 'build'
 
     if f is None:
@@ -71,7 +76,12 @@
         workdir=".",
         haltOnFailure=False))
 
-    CmakeCommand.applyRequiredOptions(cmake_opts, [
+    if build_standalone:
+       CmakeCommand.applyRequiredOptions(cmake_opts, [
+        ('-DLLVM_ENABLE_RUNTIMES=', ";".join(f.depends_on_projects)),
+        ])
+    else:
+       CmakeCommand.applyRequiredOptions(cmake_opts, [
         ('-DLLVM_ENABLE_PROJECTS=', ";".join(f.depends_on_projects)),
         ])