Index: zorg/trunk/buildbot/osuosl/master/config/builders.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py
@@ -1023,6 +1023,21 @@
                                                        stage1_config='Release'),
          'category' : 'clang'},
 
+        {'name' : "clang-cuda-build",
+         'slavenames' : ["cuda-build-test-01"],
+         'builddir' : "clang-cuda-build",
+         'factory' : ClangBuilder.getClangBuildFactory(
+                     useTwoStage=False,
+                     clean=False,
+                     test=True,
+                     stage1_config='Release',
+                     extra_cmake_args=[
+                         '-DLLVM_ENABLE_ASSERTIONS=ON',
+                         "-DCMAKE_C_COMPILER:FILEPATH=/usr/bin/clang-3.8",
+                         "-DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/clang++-3.8"
+                     ]),
+         'category' : 'clang'},
+
         # lldb builders
         {'name': "lldb-x86_64-debian-clang",
          'slavenames': ["gribozavr5"],
Index: zorg/trunk/buildbot/osuosl/master/config/slaves.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py
@@ -196,6 +196,9 @@
         # FreeBSD 11.0-CURRENT amd64, Intel(R) Xeon(R) CPU E3-1230 v3 @ 3.30GHz
         create_slave("freebsd01", properties={'jobs': 3}, max_builds=1),
 
+        # Ubuntu 16.04 x86_64, 2 x Intel(R) Xeon(R) CPU E5-2690 v3 @ 2.60GHz, 64GB of RAM
+        create_slave("cuda-build-test-01", properties={'jobs': 72}, max_builds=1),
+
         # Defunct.
         # Intel(R) Pentium(R) CPU G620 @ 2.60GHz, Ubuntu i686
         #create_slave("botether", properties={'jobs': 2}, max_builds=1),