TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-18 00:40:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: rip out exception tracer for now

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2024-08-01 16:56:35 +02:00
parent cb4390ea41
commit aafe4e5fbc
2 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
CMakeLists.txt
View File

@ -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 <LIB_ITEM>")
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(CMAKE_C_LINK_LIBRARY_USING_WHOLE_ARCHIVE "/WHOLEARCHIVE:<LIBRARY>")
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"
"<LINK_ITEM>"
"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
$<$<BOOL:${ENABLE_RICEPP}>: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
"$<LINK_LIBRARY:WHOLE_ARCHIVE,dwarfs_folly_exception_tracer_base_lite>")
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)

2
src/dwarfs/error.cpp
View File

@ -77,8 +77,6 @@ void dump_exceptions() {
for (auto& exc : exceptions) {
std::cerr << exc << "\n";
}
#else
std::cerr << "cannot dump exceptions\n";
#endif
}