jroelofs created this revision.
jroelofs added a reviewer: EricWF.
jroelofs added a subscriber: cfe-commits.

Now that we store this information in the __config file, these aren't needed.

http://reviews.llvm.org/D14130

Files:
  zorg/buildbot/builders/LibcxxAndAbiBuilder.py

Index: zorg/buildbot/builders/LibcxxAndAbiBuilder.py
===================================================================
--- zorg/buildbot/builders/LibcxxAndAbiBuilder.py
+++ zorg/buildbot/builders/LibcxxAndAbiBuilder.py
@@ -70,18 +70,6 @@
 
     f = getLibcxxWholeTree(f, src_root)
 
-    if 'libcxxabi-has-no-threads' in additional_features:
-        env['CXXFLAGS'] = (env.get('CXXFLAGS', '') +
-                           ' -DLIBCXXABI_HAS_NO_THREADS=1')
-
-    if 'libcpp-has-no-threads' in additional_features:
-        env['CXXFLAGS'] = (env.get('CXXFLAGS', '') +
-                           ' -D_LIBCPP_HAS_NO_THREADS')
-
-    if 'libcpp-has-no-monotonic-clock' in additional_features:
-        env['CXXFLAGS'] = (env.get('CXXFLAGS', '') +
-                           ' -D_LIBCPP_HAS_NO_MONOTONIC_CLOCK')
-
     # Specify the max number of threads using properties so LIT doesn't use
     # all the threads on the system.
     litTestArgs = '-sv --show-unsupported --show-xfail --threads=%(jobs)s'


Index: zorg/buildbot/builders/LibcxxAndAbiBuilder.py
===================================================================
--- zorg/buildbot/builders/LibcxxAndAbiBuilder.py
+++ zorg/buildbot/builders/LibcxxAndAbiBuilder.py
@@ -70,18 +70,6 @@
 
     f = getLibcxxWholeTree(f, src_root)
 
-    if 'libcxxabi-has-no-threads' in additional_features:
-        env['CXXFLAGS'] = (env.get('CXXFLAGS', '') +
-                           ' -DLIBCXXABI_HAS_NO_THREADS=1')
-
-    if 'libcpp-has-no-threads' in additional_features:
-        env['CXXFLAGS'] = (env.get('CXXFLAGS', '') +
-                           ' -D_LIBCPP_HAS_NO_THREADS')
-
-    if 'libcpp-has-no-monotonic-clock' in additional_features:
-        env['CXXFLAGS'] = (env.get('CXXFLAGS', '') +
-                           ' -D_LIBCPP_HAS_NO_MONOTONIC_CLOCK')
-
     # Specify the max number of threads using properties so LIT doesn't use
     # all the threads on the system.
     litTestArgs = '-sv --show-unsupported --show-xfail --threads=%(jobs)s'
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to