mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-19 01:57:52 +08:00
42bb0d9e8d
* Add libdwarf 0.9.0 * Bump hash * Retrofit cpptrace and fix a libdwarf issue * Bump * Bump a baseline * Undo baseline bump * Undo port version bump * Add libdwarf 0.9.1 * Bump hash * Move zstd patch to dependencies.diff * Bump baseline * Bump * Undo changes to versoins/c-/cpptrace.json * properly update cpptrace port version * --overwrite-version this time * Forgot to delete file * fix hash
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 418afae..4e94083 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -350,7 +350,7 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
|
|
if(CPPTRACE_CONAN)
|
|
target_link_libraries(${target_name} PRIVATE libdwarf::libdwarf)
|
|
elseif(CPPTRACE_VCPKG)
|
|
- target_link_libraries(${target_name} PRIVATE $<IF:$<TARGET_EXISTS:libdwarf::dwarf-static>,libdwarf::dwarf-static,libdwarf::dwarf-shared>)
|
|
+ target_link_libraries(${target_name} PRIVATE libdwarf::dwarf)
|
|
else()
|
|
target_link_libraries(${target_name} PRIVATE libdwarf::dwarf-static)
|
|
endif()
|
|
diff --git a/src/symbols/symbols_with_libdwarf.cpp b/src/symbols/symbols_with_libdwarf.cpp
|
|
index a13c1bd..1e33f9d 100644
|
|
--- a/src/symbols/symbols_with_libdwarf.cpp
|
|
+++ b/src/symbols/symbols_with_libdwarf.cpp
|
|
@@ -20,7 +20,7 @@
|
|
#include <unordered_map>
|
|
#include <vector>
|
|
|
|
-#ifdef CPPTRACE_USE_EXTERNAL_LIBDWARF
|
|
+#if 0
|
|
#include <libdwarf/libdwarf.h>
|
|
#include <libdwarf/dwarf.h>
|
|
#else
|
|
diff --git a/src/utils/dwarf.hpp b/src/utils/dwarf.hpp
|
|
index 61a8ea5..2210de3 100644
|
|
--- a/src/utils/dwarf.hpp
|
|
+++ b/src/utils/dwarf.hpp
|
|
@@ -9,7 +9,7 @@
|
|
#include <stdexcept>
|
|
#include <type_traits>
|
|
|
|
-#ifdef CPPTRACE_USE_EXTERNAL_LIBDWARF
|
|
+#if 0
|
|
#include <libdwarf/libdwarf.h>
|
|
#include <libdwarf/dwarf.h>
|
|
#else
|