From 485ae28ba7098885c1916150069528dd447c2aa9 Mon Sep 17 00:00:00 2001 From: Niklas Poslovski Date: Mon, 18 Sep 2023 20:34:14 +0200 Subject: [PATCH] AK: Add support for backtraces on Haiku --- AK/Assertions.cpp | 2 +- Meta/Lagom/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AK/Assertions.cpp b/AK/Assertions.cpp index 17090877b8..2ab2d3f879 100644 --- a/AK/Assertions.cpp +++ b/AK/Assertions.cpp @@ -10,7 +10,7 @@ #include #include -#if (defined(AK_OS_LINUX) && !defined(AK_OS_ANDROID)) || defined(AK_LIBC_GLIBC) || defined(AK_OS_BSD_GENERIC) || defined(AK_OS_SOLARIS) +#if (defined(AK_OS_LINUX) && !defined(AK_OS_ANDROID)) || defined(AK_LIBC_GLIBC) || defined(AK_OS_BSD_GENERIC) || defined(AK_OS_SOLARIS) || defined(AK_OS_HAIKU) # define EXECINFO_BACKTRACE #endif diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index 4ea11b1b3e..bfd402c31f 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -340,8 +340,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS") # Solaris has socket and networking related functions in two extra libraries target_link_libraries(LibCore PRIVATE nsl socket) endif() -if (${CMAKE_SYSTEM_NAME} MATCHES "BSD$") - # BSD Platforms have backtrace(3) in a separate library +if (${CMAKE_SYSTEM_NAME} MATCHES "BSD$" OR HAIKU) + # BSD Platforms and Haiku have backtrace(3) in a separate library target_link_libraries(LibCore PRIVATE execinfo) endif() if (HAIKU)