diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2017-10-23 17:13:24 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2017-10-23 17:13:24 +0000 |
| commit | aedda3bafc51592f48405f09aa046495135d4703 (patch) | |
| tree | 8048822882339ea38aa9ef5655c540af0c0f1830 | |
| parent | 028c4cddad4bb4f2979c53aba3cb2e00d1f50397 (diff) | |
| download | bcm5719-llvm-aedda3bafc51592f48405f09aa046495135d4703.tar.gz bcm5719-llvm-aedda3bafc51592f48405f09aa046495135d4703.zip | |
Revert "[Compiler-rt][MIPS] Fix cross build for XRAY."
Breaks build:
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux/builds/4677/steps/build%20with%20ninja/logs/stdio
In file included from compiler-rt/lib/xray/xray_fdr_logging.cc:34:
In file included from compiler-rt/lib/xray/xray_fdr_logging_impl.h:36:
In file included from compiler-rt/lib/xray/xray_flags.h:18:
compiler-rt/lib/xray/../sanitizer_common/sanitizer_flag_parser.h:23:7: error: '__sanitizer::FlagHandlerBase' has virtual functions but non-virtual destructor [-Werror,-Wnon-virtual-dtor]
class FlagHandlerBase {
llvm-svn: 316348
| -rw-r--r-- | compiler-rt/lib/xray/CMakeLists.txt | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/compiler-rt/lib/xray/CMakeLists.txt b/compiler-rt/lib/xray/CMakeLists.txt index 42f5ee69aff..6d24ba8bfed 100644 --- a/compiler-rt/lib/xray/CMakeLists.txt +++ b/compiler-rt/lib/xray/CMakeLists.txt @@ -60,12 +60,6 @@ include_directories(../../include) set(XRAY_CFLAGS ${SANITIZER_COMMON_CFLAGS}) set(XRAY_COMMON_DEFINITIONS XRAY_HAS_EXCEPTIONS=1) - -if (NOT MSVC AND NOT DEFINED TARGET_FLAGS) - set(TARGET_FLAGS ${CMAKE_CXX_FLAGS}) - separate_arguments(TARGET_FLAGS) -endif() - append_list_if( COMPILER_RT_HAS_XRAY_COMPILER_FLAG XRAY_SUPPORTED=1 XRAY_COMMON_DEFINITIONS) append_list_if( @@ -73,7 +67,7 @@ append_list_if( add_compiler_rt_object_libraries(RTXray ARCHS ${XRAY_SUPPORTED_ARCH} - SOURCES ${XRAY_SOURCES} CFLAGS ${XRAY_CFLAGS} ${TARGET_FLAGS} + SOURCES ${XRAY_SOURCES} CFLAGS ${XRAY_CFLAGS} DEFS ${XRAY_COMMON_DEFINITIONS}) add_compiler_rt_component(xray) @@ -88,7 +82,7 @@ foreach(arch ${XRAY_SUPPORTED_ARCH}) STATIC ARCHS ${arch} SOURCES ${${arch}_SOURCES} - CFLAGS ${XRAY_CFLAGS} ${TARGET_FLAGS} + CFLAGS ${XRAY_CFLAGS} DEFS ${XRAY_COMMON_DEFINITIONS} OBJECT_LIBS ${XRAY_COMMON_RUNTIME_OBJECT_LIBS} PARENT_TARGET xray) |
