[compiler-rt] 75a1f52 - [compiler-rt] Don't include libc++ headers from the source tree in MSAN
Vitaly Buka via llvm-commits
llvm-commits at lists.llvm.org
Fri Oct 30 02:36:17 PDT 2020
Author: Louis Dionne
Date: 2020-10-30T02:36:02-07:00
New Revision: 75a1f52c1a129b2c0e77f8c54fc5182c613c2837
URL: https://github.com/llvm/llvm-project/commit/75a1f52c1a129b2c0e77f8c54fc5182c613c2837
DIFF: https://github.com/llvm/llvm-project/commit/75a1f52c1a129b2c0e77f8c54fc5182c613c2837.diff
LOG: [compiler-rt] Don't include libc++ headers from the source tree in MSAN
We shouldn't be including the libc++ headers from the source tree directly, since those headers are not configured (i.e. they don't use the __config_site) header like they should, which could mean up to ABI differences
Reviewed By: vitalybuka, phosek, ldionne
Differential Revision: https://reviews.llvm.org/D89915
Added:
Modified:
compiler-rt/lib/msan/tests/CMakeLists.txt
Removed:
################################################################################
diff --git a/compiler-rt/lib/msan/tests/CMakeLists.txt b/compiler-rt/lib/msan/tests/CMakeLists.txt
index 541356fc68d8..de3d95094848 100644
--- a/compiler-rt/lib/msan/tests/CMakeLists.txt
+++ b/compiler-rt/lib/msan/tests/CMakeLists.txt
@@ -26,7 +26,6 @@ set(MSAN_UNITTEST_HEADERS
)
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 @@ macro(msan_compile obj_list source arch kind cflags)
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()
More information about the llvm-commits
mailing list