Skip to content

Commit e510533

Browse files
ldionnememfrob
authored andcommitted
[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
1 parent a8e142b commit e510533

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ set(MSAN_UNITTEST_HEADERS
2626
)
2727
set(MSAN_UNITTEST_COMMON_CFLAGS
2828
-nostdinc++
29-
-isystem ${COMPILER_RT_LIBCXX_PATH}/include
3029
${COMPILER_RT_UNITTEST_CFLAGS}
3130
${COMPILER_RT_GTEST_CFLAGS}
3231
-I${COMPILER_RT_SOURCE_DIR}/include
@@ -67,7 +66,8 @@ macro(msan_compile obj_list source arch kind cflags)
6766
KIND ${kind}
6867
COMPILE_DEPS ${MSAN_UNITTEST_HEADERS}
6968
DEPS gtest msan
70-
CFLAGS ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${cflags}
69+
CFLAGS -isystem ${CMAKE_CURRENT_BINARY_DIR}/../libcxx_msan_${arch}/include/c++/v1
70+
${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${cflags}
7171
)
7272
endmacro()
7373

0 commit comments

Comments
 (0)