diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2015-10-08 22:21:36 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2015-10-08 22:21:36 +0000 |
| commit | 6870dc7311b769f400fdcc2a041aaf5cdc041dfc (patch) | |
| tree | 525b06c66c966e645467ade077cd34eaa7fb24aa | |
| parent | a3da44882fd50f38ea4dd70c6ce4113c98c0b543 (diff) | |
| download | bcm5719-llvm-6870dc7311b769f400fdcc2a041aaf5cdc041dfc.tar.gz bcm5719-llvm-6870dc7311b769f400fdcc2a041aaf5cdc041dfc.zip | |
Fix msan tests build.
CMake build rules listed -I flags for two different libc++ header
locations which broke when libc++ headers started using include_next.
Also change -I to -isystem to avoid compiler warning about
include_next.
llvm-svn: 249759
| -rw-r--r-- | compiler-rt/lib/msan/tests/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler-rt/lib/msan/tests/CMakeLists.txt b/compiler-rt/lib/msan/tests/CMakeLists.txt index 0f66e2518c3..e3ad4abe5aa 100644 --- a/compiler-rt/lib/msan/tests/CMakeLists.txt +++ b/compiler-rt/lib/msan/tests/CMakeLists.txt @@ -18,13 +18,13 @@ set(MSAN_UNITTEST_HEADERS ../../../include/sanitizer/msan_interface.h ) set(MSAN_UNITTEST_COMMON_CFLAGS - -I${COMPILER_RT_LIBCXX_PATH}/include + -nostdinc++ + -isystem ${COMPILER_RT_LIBCXX_PATH}/include ${COMPILER_RT_TEST_CFLAGS} ${COMPILER_RT_GTEST_CFLAGS} -I${COMPILER_RT_SOURCE_DIR}/include -I${COMPILER_RT_SOURCE_DIR}/lib -I${COMPILER_RT_SOURCE_DIR}/lib/msan - -stdlib=libc++ -g -O2 -fno-exceptions @@ -44,6 +44,8 @@ set(MSAN_UNITTEST_INSTRUMENTED_CFLAGS ) set(MSAN_UNITTEST_LINK_FLAGS -fsanitize=memory + # Don't need -stdlib=libc++ because we explicitly list libc++.so in the linker + # inputs. # FIXME: we build libcxx without cxxabi and need libstdc++ to provide it. -lstdc++ ) |
