[zorg] r283648 - Add temporary workaround for libc++ UBSAN link failures

[Eric Fiselier via llvm-commits]

Author: ericwf
Date: Fri Oct  7 22:05:26 2016
New Revision: 283648

URL: http://llvm.org/viewvc/llvm-project?rev=283648&view=rev
Log:
Add temporary workaround for libc++ UBSAN link failures

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=283648&r1=283647&r2=283648&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Oct  7 22:05:26 2016
@@ -984,7 +984,9 @@ def _get_libcxx_builders():
                  'CC': 'clang', 'CXX': 'clang++'},
             cmake_extra_opts={'LLVM_USE_SANITIZER': 'Undefined',
                               'LIBCXX_ABI_UNSTABLE': 'ON'},
-            lit_extra_opts={'std':'c++1z'}),
+            # FIXME This is a workaround for PR30643 (See http://llvm.org/PR30643)
+            lit_extra_opts={'std':'c++1z',
+                            'link_flags': '/usr/local/lib/clang/4.0.0/lib/linux/libclang_rt.builtins-x86_64.a'}),
         'category': 'libcxx'},
 
         # EricWF's builders on ericwf-buildslave2