diff options
| author | Sam McCall <sam.mccall@gmail.com> | 2019-08-21 13:56:29 +0000 |
|---|---|---|
| committer | Sam McCall <sam.mccall@gmail.com> | 2019-08-21 13:56:29 +0000 |
| commit | a451156bb6ceb3700f6ea42e47e9a95d67723318 (patch) | |
| tree | 4227645ea627fffc6f82efaaec49e7573e954211 /compiler-rt/cmake | |
| parent | 4d668a1f077d1ddea6130c52f793817063046b68 (diff) | |
| download | bcm5719-llvm-a451156bb6ceb3700f6ea42e47e9a95d67723318.tar.gz bcm5719-llvm-a451156bb6ceb3700f6ea42e47e9a95d67723318.zip | |
reland [gtest] Fix printing of StringRef and SmallString in assert messages.
Renames GTEST_NO_LLVM_RAW_OSTREAM -> GTEST_NO_LLVM_SUPPORT and guards
the new features behind it.
This reverts commit a063bcf3ef5a879adbe9639a3c187d876eee0e66.
llvm-svn: 369527
Diffstat (limited to 'compiler-rt/cmake')
| -rw-r--r-- | compiler-rt/cmake/Modules/AddCompilerRT.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake index f7ee932f214..322e4221a81 100644 --- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake +++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake @@ -360,7 +360,7 @@ set(COMPILER_RT_UNITTEST_LINK_FLAGS ${COMPILER_RT_UNITTEST_CFLAGS}) set(COMPILER_RT_GTEST_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest) set(COMPILER_RT_GTEST_SOURCE ${COMPILER_RT_GTEST_PATH}/src/gtest-all.cc) set(COMPILER_RT_GTEST_CFLAGS - -DGTEST_NO_LLVM_RAW_OSTREAM=1 + -DGTEST_NO_LLVM_SUPPORT=1 -DGTEST_HAS_RTTI=0 -I${COMPILER_RT_GTEST_PATH}/include -I${COMPILER_RT_GTEST_PATH} @@ -370,7 +370,7 @@ set(COMPILER_RT_GTEST_CFLAGS set(COMPILER_RT_GMOCK_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googlemock) set(COMPILER_RT_GMOCK_SOURCE ${COMPILER_RT_GMOCK_PATH}/src/gmock-all.cc) set(COMPILER_RT_GMOCK_CFLAGS - -DGTEST_NO_LLVM_RAW_OSTREAM=1 + -DGTEST_NO_LLVM_SUPPORT=1 -DGTEST_HAS_RTTI=0 -I${COMPILER_RT_GMOCK_PATH}/include -I${COMPILER_RT_GMOCK_PATH} |
