This revision was automatically updated to reflect the committed changes. Closed by commit rL295963: [zorg] Fix no-exceptions libcxx configurations (authored by asiri).
Changed prior to commit: https://reviews.llvm.org/D30290?vs=89485&id=89496#toc Repository: rL LLVM https://reviews.llvm.org/D30290 Files: zorg/trunk/buildbot/osuosl/master/config/builders.py 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 @@ -1044,7 +1044,8 @@ '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 @@ 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 @@ 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'})}, ]
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 @@ -1044,7 +1044,8 @@ '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 @@ 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 @@ 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'})}, ]
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits