diff options
| author | bunnei <bunneidev@gmail.com> | 2023-01-24 11:03:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-24 11:03:14 -0800 |
| commit | 44b981fd3eb3db5c15bcc24e61bae45607223ee6 (patch) | |
| tree | 62d8081e018120505df0832ca9af1671be8e8d1f /src | |
| parent | a68af583ea378b48e2ed5a19f519a815ba89e40f (diff) | |
| parent | 34b1ea9c1925d0da9377973d25e10e9b5ec40e94 (diff) | |
Merge pull request #9662 from abouvier/cmake-llvm
cmake: prefer system llvm library
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/common/demangle.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index bd6ac67161..9884a4a0b4 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -177,7 +177,7 @@ endif() create_target_directory_groups(common) target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt::fmt microprofile Threads::Threads) -target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd demangle) +target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd LLVM::Demangle) if (YUZU_USE_PRECOMPILED_HEADERS) target_precompile_headers(common PRIVATE precompiled_headers.h) diff --git a/src/common/demangle.cpp b/src/common/demangle.cpp index f4246f6668..3310faf86a 100644 --- a/src/common/demangle.cpp +++ b/src/common/demangle.cpp @@ -1,13 +1,11 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include <llvm/Demangle/Demangle.h> + #include "common/demangle.h" #include "common/scope_exit.h" -namespace llvm { -char* itaniumDemangle(const char* mangled_name, char* buf, size_t* n, int* status); -} - namespace Common { std::string DemangleSymbol(const std::string& mangled) { |