[PATCH] D35514: [CMake] Use MATCHES for regular expression comparison.

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


This revision was automatically updated to reflect the committed changes.
Closed by commit rL308347: [CMake] Use MATCHES for regular expression. (authored by aoli).

Repository:
  rL LLVM

https://reviews.llvm.org/D35514

Files:
  libcxx/trunk/lib/CMakeLists.txt


Index: libcxx/trunk/lib/CMakeLists.txt
===================================================================
--- libcxx/trunk/lib/CMakeLists.txt
+++ libcxx/trunk/lib/CMakeLists.txt
@@ -258,7 +258,7 @@
       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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D35514.107160.patch
Type: text/x-patch
Size: 656 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20170718/f9381ce9/attachment.bin>


More information about the cfe-commits mailing list