From aafe4e5fbc95b121371fa8de6dcc44b83d7bba97 Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Thu, 1 Aug 2024 16:56:35 +0200 Subject: [PATCH] chore: rip out exception tracer for now --- CMakeLists.txt | 47 -------------------------------------------- src/dwarfs/error.cpp | 2 -- 2 files changed, 49 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e41eb09b..fb7e9973 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,20 +165,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") add_compile_definitions(_WIN32_WINNT=0x0601 WINVER=0x0601) endif() -if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") - set(CMAKE_C_LINK_LIBRARY_USING_WHOLE_ARCHIVE "-force_load ") -elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - set(CMAKE_C_LINK_LIBRARY_USING_WHOLE_ARCHIVE "/WHOLEARCHIVE:") -elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - set(CMAKE_C_LINK_LIBRARY_USING_WHOLE_ARCHIVE - "LINKER:--push-state,--whole-archive" - "" - "LINKER:--pop-state" - ) -else() - message(FATAL_ERROR "WHOLE_ARCHIVE is unsupported on this platform") -endif() - include(${CMAKE_SOURCE_DIR}/cmake/version.cmake) include(${CMAKE_SOURCE_DIR}/cmake/thrift_library.cmake) @@ -1033,13 +1019,6 @@ if(WITH_MAN_PAGES) add_custom_target(manpages ALL DEPENDS ${MAN_PAGES}) endif() -set(DWARFS_USE_EXCEPTION_TRACER OFF) -if(NOT STATIC_BUILD_DO_NOT_USE) - if(TARGET folly_exception_tracer) - set(DWARFS_USE_EXCEPTION_TRACER ON) - endif() -endif() - if(DWARFS_GIT_BUILD) set(THRIFT_GENERATED_DIR ${CMAKE_CURRENT_BINARY_DIR}) else() @@ -1111,10 +1090,6 @@ foreach(tgt dwarfs_common dwarfs_reader dwarfs_writer dwarfs_extractor dwarfs_to $<$:DWARFS_HAVE_RICEPP> ) - if(DWARFS_USE_EXCEPTION_TRACER) - target_compile_definitions(${tgt} PRIVATE DWARFS_USE_EXCEPTION_TRACER) - endif() - if(ENABLE_PERFMON) target_compile_definitions(${tgt} PRIVATE DWARFS_PERFMON_ENABLED=1) endif() @@ -1227,32 +1202,10 @@ endif() target_link_libraries(dwarfs_extractor PRIVATE PkgConfig::LIBARCHIVE) -if(DWARFS_USE_EXCEPTION_TRACER) - add_library( - dwarfs_folly_exception_tracer_base_lite - ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/exception_tracer/ExceptionTracer.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/debugging/exception_tracer/StackTrace.cpp - ) - set_property(TARGET dwarfs_folly_exception_tracer_base_lite PROPERTY CXX_STANDARD 20) - apply_folly_compile_options_to_target(dwarfs_folly_exception_tracer_base_lite) - target_link_libraries( - dwarfs_folly_exception_tracer_base_lite - PUBLIC dwarfs_folly_lite - ) -endif() - foreach(tgt ${MAIN_TARGETS} ${BINARY_TARGETS} ${TEST_TARGETS}) target_link_libraries(${tgt} PRIVATE dwarfs_tool) endforeach() -foreach(tgt ${BINARY_TARGETS} ${TEST_TARGETS}) - target_link_libraries(${tgt} PRIVATE dwarfs_common) - if(DWARFS_USE_EXCEPTION_TRACER) - target_link_libraries(${tgt} PRIVATE - "$") - endif() -endforeach() - target_link_libraries(mkdwarfs_main PRIVATE dwarfs_reader dwarfs_writer range-v3::range-v3) target_link_libraries(dwarfsck_main PRIVATE dwarfs_reader) target_link_libraries(dwarfsextract_main PRIVATE dwarfs_extractor) diff --git a/src/dwarfs/error.cpp b/src/dwarfs/error.cpp index eba1914a..3d1491e8 100644 --- a/src/dwarfs/error.cpp +++ b/src/dwarfs/error.cpp @@ -77,8 +77,6 @@ void dump_exceptions() { for (auto& exc : exceptions) { std::cerr << exc << "\n"; } -#else - std::cerr << "cannot dump exceptions\n"; #endif }