Merged to 6.0 in r324874.
On Sun, Feb 11, 2018 at 11:31 PM, Dimitry Andric via cfe-commits <cfe-commits@lists.llvm.org> wrote: > Author: dim > Date: Sun Feb 11 14:31:05 2018 > New Revision: 324855 > > URL: http://llvm.org/viewvc/llvm-project?rev=324855&view=rev > Log: > Add default C++ ABI libname and include paths for FreeBSD > > Summary: > As noted in a discussion about testing the LLVM 6.0.0 release candidates > (with libc++) for FreeBSD, many tests turned out to fail with > "exception_ptr not yet implemented". This was because libc++ did not > choose the correct C++ ABI library, and therefore it fell back to the > `exception_fallback.ipp` header. > > Since FreeBSD 10.x, we have been using libcxxrt as our C++ ABI library, > and its headers have always been installed in /usr/include/c++/v1, > together with the (system) libc++ headers. (Older versions of FreeBSD > used GNU libsupc++ by default, but these are now unsupported.) > > Therefore, if we are building libc++ for FreeBSD, set: > * `LIBCXX_CXX_ABI_LIBNAME` to "libcxxrt" > * `LIBCXX_CXX_ABI_INCLUDE_PATHS` to "/usr/include/c++/v1" > by default. > > Reviewers: emaste, EricWF, mclow.lists > > Reviewed By: EricWF > > Subscribers: mgorny, cfe-commits, krytarowski > > Differential Revision: https://reviews.llvm.org/D43166 > > Modified: > libcxx/trunk/CMakeLists.txt > > Modified: libcxx/trunk/CMakeLists.txt > URL: > http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=324855&r1=324854&r2=324855&view=diff > ============================================================================== > --- libcxx/trunk/CMakeLists.txt (original) > +++ libcxx/trunk/CMakeLists.txt Sun Feb 11 14:31:05 2018 > @@ -136,6 +136,9 @@ if (LIBCXX_CXX_ABI STREQUAL "default") > elseif (APPLE) > set(LIBCXX_CXX_ABI_LIBNAME "libcxxabi") > set(LIBCXX_CXX_ABI_SYSTEM 1) > + elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") > + set(LIBCXX_CXX_ABI_LIBNAME "libcxxrt") > + set(LIBCXX_CXX_ABI_INCLUDE_PATHS "/usr/include/c++/v1") > else() > set(LIBCXX_CXX_ABI_LIBNAME "default") > endif() > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
