[zorg] r295963 - [zorg] Fix no-exceptions libcxx configurations

[Asiri Rathnayake via llvm-commits]

Author: asiri
Date: Thu Feb 23 06:13:43 2017
New Revision: 295963

URL: http://llvm.org/viewvc/llvm-project?rev=295963&view=rev
Log:
[zorg] Fix no-exceptions libcxx configurations

The no-exceptions builders are missing the -DLIBCXXABI_ENABLE_EXCEPTIONS=OFF
flag (without this, only the libc++ libraries will be built without exceptions
support, libc++abi will still be built with exceptions support - this is not
a meaningful configuration).

We should also be able to get rid of the unwinder dependency from these builds
and tests. Waiting for confirmation from buildbot maintainers before going ahead
with that change - need to make sure there are no other hidden dependencies on
the unwinder (otherwise the builds could break).

Differential revision: https://reviews.llvm.org/D30290

Reviewers: rengolin

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=295963&r1=295962&r2=295963&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Feb 23 06:13:43 2017
@@ -1044,7 +1044,8 @@ def _get_libcxx_builders():
          'builddir': 'libcxx-libcxxabi-x86_64-linux-debian-noexceptions',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
              env={'CC': 'clang', 'CXX': 'clang++'},
-             cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF'},
+             cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+                               'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF'},
              lit_extra_args=['--shuffle']),
          'category': 'libcxx'},
 
@@ -1194,6 +1195,7 @@ def _get_libcxx_builders():
             lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
             cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+                              'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -mthumb',
                               'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -mthumb',
                               'LLVM_PARALLEL_LINK_JOBS': '2'})},
@@ -1224,6 +1226,7 @@ def _get_libcxx_builders():
             lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-aarch64"'},
             cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
                               'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
+                              'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
                               'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
     ]