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

[Vitaly Buka via Phabricator via llvm-commits]

vitalybuka updated this revision to Diff 300464.
vitalybuka added a comment.

use custom libc++


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
@@ -26,7 +26,6 @@
   )
 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
@@ -67,7 +66,8 @@
     KIND ${kind}
     COMPILE_DEPS ${MSAN_UNITTEST_HEADERS}
     DEPS gtest msan
-    CFLAGS ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${cflags}
+    CFLAGS -isystem ${CMAKE_CURRENT_BINARY_DIR}/../libcxx_msan_${arch}/include/c++/v1
+           ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${cflags}
   )
 endmacro()
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D89915.300464.patch
Type: text/x-patch
Size: 755 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201024/2ec74801/attachment.bin>