diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d34596b..61afc1ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,13 +82,13 @@ endif() if(NOT WIN32) check_support(HAS_UNWIND has_unwind.cpp "" "" "") check_support(HAS_EXECINFO has_execinfo.cpp "" "" "") - check_support(HAS_BACKTRACE has_backtrace.cpp "" "backtrace" "${CPPTRACE_BACKTRACE_PATH_DEFINITION}") - set(STACKTRACE_LINK_LIB "stdc++_libbacktrace") else() check_support(HAS_STACKWALK has_stackwalk.cpp "" "dbghelp" "") endif() if(NOT WIN32 OR MINGW) + check_support(HAS_BACKTRACE has_backtrace.cpp "" "backtrace" "${CPPTRACE_BACKTRACE_PATH_DEFINITION}") + set(STACKTRACE_LINK_LIB "stdc++_libbacktrace") check_support(HAS_CXX_EXCEPTION_TYPE has_cxx_exception_type.cpp "" "" "") endif() diff --git a/src/platform/program_name.hpp b/src/platform/program_name.hpp index 3257244d..a51f677a 100644 --- a/src/platform/program_name.hpp +++ b/src/platform/program_name.hpp @@ -13,7 +13,7 @@ namespace cpptrace { namespace detail { - inline std::string program_name() { + inline const char* program_name() { static std::mutex mutex; const std::lock_guard lock(mutex); static std::string name;