[zorg] r223592 - Update the libcpp-has-no-threads bot to use the CMake configuration options.

[Eric Fiselier]

Author: ericwf
Date: Sat Dec  6 15:09:03 2014
New Revision: 223592

URL: http://llvm.org/viewvc/llvm-project?rev=223592&view=rev
Log:
Update the libcpp-has-no-threads bot to use the CMake configuration options.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=223592&r1=223591&r2=223592&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Sat Dec  6 15:09:03 2014
@@ -720,10 +720,9 @@ def _get_libcxx_builders():
          'builddir': 'libcxx-libcxxabi-singlethreaded-x86_64-linux-debian',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
              env={'CC': 'clang', 'CXX': 'clang++'},
-             additional_features=set(['libcxxabi-has-no-threads',
-                                      'libcpp-has-no-threads',
-                                      'libcpp-has-no-monotonic-clock']),
-             cmake_extra_opts={'LIBCXXABI_ENABLE_THREADS' : 'OFF'}),
+             cmake_extra_opts={'LIBCXX_ENABLE_THREADS': 'OFF',
+                               'LIBCXX_ENABLE_MONOTONIC_CLOCK': 'OFF',
+                               'LIBCXXABI_ENABLE_THREADS': 'OFF'}),
          'category': 'libcxx'},
 
         # EricWF's builders. A default configuration build