[llvm-branch-commits] [libcxx] r324874 - Merging r324855:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Mon Feb 12 02:04:36 2018
New Revision: 324874

URL: http://llvm.org/viewvc/llvm-project?rev=324874&view=rev
Log:
Merging r324855:
------------------------------------------------------------------------
r324855 | dim | 2018-02-11 23:31:05 +0100 (Sun, 11 Feb 2018) | 26 lines

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/branches/release_60/   (props changed)
    libcxx/branches/release_60/CMakeLists.txt

Propchange: libcxx/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 12 02:04:36 2018
@@ -1,2 +1,2 @@
 /libcxx/branches/apple:136569-137939
-/libcxx/trunk:321963,324153
+/libcxx/trunk:321963,324153,324855

Modified: libcxx/branches/release_60/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_60/CMakeLists.txt?rev=324874&r1=324873&r2=324874&view=diff
==============================================================================
--- libcxx/branches/release_60/CMakeLists.txt (original)
+++ libcxx/branches/release_60/CMakeLists.txt Mon Feb 12 02:04:36 2018
@@ -135,6 +135,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()