[PATCH] D58767: [compiler-rt] [CMake] Don't use llvm_replace_compiler_option

[Martin Storsjö via Phabricator via llvm-commits]

mstorsjo updated this revision to Diff 188858.
mstorsjo retitled this revision from "[compiler-rt] [CMake] Check for llvm_replace_compiler_option before using it" to "[compiler-rt] [CMake] Don't use llvm_replace_compiler_option".
mstorsjo edited the summary of this revision.
mstorsjo added a comment.

Changed to do the same thing with a regex.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D58767/new/

https://reviews.llvm.org/D58767

Files:
  CMakeLists.txt


Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -375,9 +375,13 @@
   # warning from the MS linker complaining that it can't find the 'vc140.pdb'
   # file used by our object library compilations.
   list(APPEND SANITIZER_COMMON_CFLAGS /Z7)
-  llvm_replace_compiler_option(CMAKE_CXX_FLAGS "/Z[i7I]" "/Z7")
-  llvm_replace_compiler_option(CMAKE_CXX_FLAGS_DEBUG "/Z[i7I]" "/Z7")
-  llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Z[i7I]" "/Z7")
+  foreach(var_to_update
+      CMAKE_CXX_FLAGS
+      CMAKE_CXX_FLAGS_DEBUG
+      CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+      string(REGEX REPLACE "(^| )/Z[i7I]($| )" " /Z7 "
+             "${var_to_update}" "${${var_to_update}}")
+  endforeach()
 elseif(COMPILER_RT_HAS_GLINE_TABLES_ONLY_FLAG AND NOT COMPILER_RT_DEBUG)
   list(APPEND SANITIZER_COMMON_CFLAGS -gline-tables-only)
 elseif(COMPILER_RT_HAS_G_FLAG)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D58767.188858.patch
Type: text/x-patch
Size: 948 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190301/777555ea/attachment.bin>