[zorg] Refactor builder and factory definition for Clang-3Stage-Ubuntu bot.

[sqlbyme]

Summary

The clang-3stage-ubuntu bot is currently offline as it was causing build failure due to a misconfiguration on my part. I have corrected my rather poor python code. Once this patch is applied, this bot and builder should behave in a much more appropriate fashion.

[sqlbyme]

New Rule: Mike is no longer allowed to post patches after Midnight PST. This is a bad fix. I will go and rethink the proper solution with a clear head now.

buildbot/osuosl/master/config/builders.py

 from zorg.buildbot.builders import ABITestsuitBuilder
 
 from zorg.buildbot.builders import ClangLTOBuilder3Stage
+reload(ClangLTOBuilder3Stage)
+from zorg.buildbot.builders import ClangLTOBuilder3Stage
 
 # Plain LLVM builders.
 def _get_llvm_builders():

                 clean=True,
                 env=None,
                 build_gold=True,
-                cmake_cache_file="../llvm.src/tools/clang/cmake/caches/3-stage.cmake",
-                extra_cmake_options=["-DLLVM_TARGETS_TO_BUILD=all", "-DLLVM_BINUTILS_INCDIR=/opt/binutils/include"])},
+                cmake_cache_file=["../llvm.src/tools/clang/cmake/caches/3-stage.cmake"],
+                extra_cmake_options=[
+                    "-G", "Ninja",
+                    "-DLLVM_TARGETS_TO_BUILD=all",
+                    "-DLLVM_BINUTILS_INCDIR=/opt/binutils/include"])},
     ]
 
 # Polly builders.

zorg/buildbot/builders/ClangLTOBuilder3Stage.py

     cmake_command = ["cmake"]
     
     if cmake_cache_file:
-        cmake_command += "-C %s" % (" ".join(cmake_cache_file))
+        cmake_command += ["-C"] + cmake_cache_file
 
     if extra_cmake_options:
         cmake_command += extra_cmake_options