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
@@ -655,14 +655,13 @@
     'factory' : ClangBuilder.getClangCMakeBuildFactory(
                     clean=False,
                     checks=['check-all', 'check-runtimes'],
-                    checkout_compiler_rt=False,
                     checkout_lld=False,
                     useTwoStage=True,
+                    enable_runtimes="auto",
                     stage1_config='Release',
                     stage2_config='Release',
                     extra_cmake_args=[
                         "-DLLVM_ENABLE_ASSERTIONS=ON",
-                        "-DLLVM_ENABLE_RUNTIMES=compiler-rt",
                         "-DLLVM_CCACHE_BUILD=ON"])},
 
     {'name' : "clang-ppc64le-linux-test-suite",
@@ -687,14 +686,13 @@
     'factory' : ClangBuilder.getClangCMakeBuildFactory(
                     clean=False,
                     checks=['check-all', 'check-runtimes'],
-                    checkout_compiler_rt=False,
                     checkout_lld=False,
                     useTwoStage=True,
+                    enable_runtimes="auto",
                     stage1_config='Release',
                     stage2_config='Release',
                     extra_cmake_args=[
                         '-DLLVM_ENABLE_ASSERTIONS=ON',
-                        '-DLLVM_ENABLE_RUNTIMES=compiler-rt',
                         '-DBUILD_SHARED_LIBS=ON',
                         '-DLLVM_CCACHE_BUILD=ON'])},
 
diff --git a/zorg/buildbot/builders/ClangBuilder.py b/zorg/buildbot/builders/ClangBuilder.py
--- a/zorg/buildbot/builders/ClangBuilder.py
+++ b/zorg/buildbot/builders/ClangBuilder.py
@@ -331,9 +331,15 @@
 
 
     ############# STAGE 1
-    CmakeCommand.applyRequiredOptions(extra_cmake_args, [
-        ('-DLLVM_ENABLE_PROJECTS=', ";".join(f.depends_on_projects)),
-        ])
+    if f.enable_projects:
+        CmakeCommand.applyRequiredOptions(extra_cmake_args, [
+            ('-DLLVM_ENABLE_PROJECTS=', ";".join(f.enable_projects)),
+            ])
+    if f.enable_runtimes:
+        CmakeCommand.applyRequiredOptions(extra_cmake_args, [
+            ('-DLLVM_ENABLE_RUNTIMES=', ";".join(f.enable_runtimes)),
+            ])
+
     rel_src_dir = LLVMBuildFactory.pathRelativeTo(f.llvm_srcdir, stage1_build)
 
     f.addStep(ShellCommand(name='cmake stage 1',