[PATCH] D89915: [compiler-rt] Don't explicitly include the libc++ headers in MSAN

[Louis Dionne via Phabricator via llvm-commits]

ldionne updated this revision to Diff 300273.
ldionne added a comment.

Reword the review in the context of improving the build, instead of fixing the build bots (which should be OK now since I've reverted the __config_site change).


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D89915

Files:
  compiler-rt/lib/msan/tests/CMakeLists.txt


Index: compiler-rt/lib/msan/tests/CMakeLists.txt
===================================================================
--- compiler-rt/lib/msan/tests/CMakeLists.txt
+++ compiler-rt/lib/msan/tests/CMakeLists.txt
@@ -25,8 +25,6 @@
   ../../../include/sanitizer/msan_interface.h
   )
 set(MSAN_UNITTEST_COMMON_CFLAGS
-  -nostdinc++
-  -isystem ${COMPILER_RT_LIBCXX_PATH}/include
   ${COMPILER_RT_UNITTEST_CFLAGS}
   ${COMPILER_RT_GTEST_CFLAGS}
   -I${COMPILER_RT_SOURCE_DIR}/include
@@ -43,8 +41,6 @@
   -Werror=sign-compare
   -Wno-gnu-zero-variadic-macro-arguments
 )
-# Remove -stdlib= which is unused when passing -nostdinc++.
-string(REGEX REPLACE "-stdlib=[a-zA-Z+]*" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 
 set(MSAN_UNITTEST_INSTRUMENTED_CFLAGS
   ${MSAN_UNITTEST_COMMON_CFLAGS}


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D89915.300273.patch
Type: text/x-patch
Size: 783 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201023/ed8baeb9/attachment.bin>