[libcxx] r308347 - [CMake] Use MATCHES for regular expression.

Leo Li via cfe-commits cfe-commits at lists.llvm.org
Tue Jul 18 12:48:02 PDT 2017


Author: aoli
Date: Tue Jul 18 12:48:02 2017
New Revision: 308347

URL: http://llvm.org/viewvc/llvm-project?rev=308347&view=rev
Log:
[CMake] Use MATCHES for regular expression.

Subscribers: mgorny

Differential Revision: https://reviews.llvm.org/D35514

Modified:
    libcxx/trunk/lib/CMakeLists.txt

Modified: libcxx/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=308347&r1=308346&r2=308347&view=diff
==============================================================================
--- libcxx/trunk/lib/CMakeLists.txt (original)
+++ libcxx/trunk/lib/CMakeLists.txt Tue Jul 18 12:48:02 2017
@@ -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




More information about the cfe-commits mailing list