aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2017-07-19 07:02:49 +0000
committerDimitry Andric <dim@FreeBSD.org>2017-07-19 07:02:49 +0000
commit97a708bebca0e58714a1e005445ff28d0c1c2ca5 (patch)
treeca5965646804934581ceb1c2894df9431a357e8c /lib
parent289ae9e3ac13cefd468cfb852e8b9f52e984de08 (diff)
downloadsrc-97a708bebca0e58714a1e005445ff28d0c1c2ca5.tar.gz
src-97a708bebca0e58714a1e005445ff28d0c1c2ca5.zip
Vendor import of libc++ trunk r308421:vendor/libc++/libc++-trunk-r308421
Notes
Notes: svn path=/vendor/libc++/dist/; revision=321190 svn path=/vendor/libc++/libc++-trunk-r308421/; revision=321191; tag=vendor/libc++/libc++-trunk-r308421
Diffstat (limited to 'lib')
-rw-r--r--lib/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 9fc0d1394336..578651423f3b 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -258,7 +258,7 @@ if (LIBCXX_ENABLE_STATIC)
set(MERGE_ARCHIVES_SEARCH_PATHS "-L${LIBCXX_CXX_ABI_LIBRARY_PATH}")
endif()
if ((TARGET ${LIBCXX_CXX_ABI_LIBRARY}) OR
- (${LIBCXX_CXX_ABI_LIBRARY} STREQUAL "cxxabi(_static|_shared)?" AND HAVE_LIBCXXABI))
+ (${LIBCXX_CXX_ABI_LIBRARY} MATCHES "cxxabi(_static|_shared)?" AND HAVE_LIBCXXABI))
set(MERGE_ARCHIVES_ABI_TARGET "$<TARGET_LINKER_FILE:${LIBCXX_CXX_ABI_LIBRARY}>")
else()
set(MERGE_ARCHIVES_ABI_TARGET