Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump libunwind to llvmorg-19.1.7
Browse files Browse the repository at this point in the history
etan-status committed Jan 27, 2025

Verified

This commit was signed with the committer’s verified signature.
Freyskeyd Simon Paitrault
1 parent 4553145 commit 8a48b0c
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion UpdateLibunwind
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")"
git diff --exit-code -- . ':(exclude)UpdateLibunwind' > /dev/null || { echo "Commit changes before updating!" ; exit 1 ; }

# https://github.com/llvm/llvm-project/releases
COMMIT="${1:-llvmorg-19.1.6}"
COMMIT="${1:-llvmorg-19.1.7}"

pushd vendor >/dev/null
rm -rf libunwind
2 changes: 1 addition & 1 deletion vendor/libunwind/cmake/Modules/LLVMVersion.cmake
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ if(NOT DEFINED LLVM_VERSION_MINOR)
set(LLVM_VERSION_MINOR 1)
endif()
if(NOT DEFINED LLVM_VERSION_PATCH)
set(LLVM_VERSION_PATCH 6)
set(LLVM_VERSION_PATCH 7)
endif()
if(NOT DEFINED LLVM_VERSION_SUFFIX)
set(LLVM_VERSION_SUFFIX)
5 changes: 3 additions & 2 deletions vendor/libunwind/llvm/cmake/modules/Findzstd.cmake
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
# zstd::libzstd_shared
# zstd::libzstd_static

if(MSVC)
if(MSVC OR "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC")
set(zstd_STATIC_LIBRARY_SUFFIX "_static\\${CMAKE_STATIC_LIBRARY_SUFFIX}$")
else()
set(zstd_STATIC_LIBRARY_SUFFIX "\\${CMAKE_STATIC_LIBRARY_SUFFIX}$")
@@ -33,7 +33,8 @@ if(zstd_FOUND)
set(zstd_STATIC_LIBRARY "${zstd_LIBRARY}")
elseif (NOT TARGET zstd::libzstd_shared)
add_library(zstd::libzstd_shared SHARED IMPORTED)
if(MSVC)
if(MSVC OR "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC")
include(GNUInstallDirs) # For CMAKE_INSTALL_LIBDIR and friends.
# IMPORTED_LOCATION is the path to the DLL and IMPORTED_IMPLIB is the "library".
get_filename_component(zstd_DIRNAME "${zstd_LIBRARY}" DIRECTORY)
if(NOT "${CMAKE_INSTALL_LIBDIR}" STREQUAL "" AND NOT "${CMAKE_INSTALL_BINDIR}" STREQUAL "")

0 comments on commit 8a48b0c

Please sign in to comment.