From 8a48b0cd76d5a3830204ee6baa5361f9460d0d86 Mon Sep 17 00:00:00 2001
From: Etan Kissling <etan@nimbus.team>
Date: Mon, 27 Jan 2025 12:38:22 +0100
Subject: [PATCH] Bump libunwind to `llvmorg-19.1.7`

- https://github.com/llvm/llvm-project/releases/tag/llvmorg-19.1.7
---
 UpdateLibunwind                                    | 2 +-
 vendor/libunwind/cmake/Modules/LLVMVersion.cmake   | 2 +-
 vendor/libunwind/llvm/cmake/modules/Findzstd.cmake | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/UpdateLibunwind b/UpdateLibunwind
index 82e46c2..877538e 100755
--- a/UpdateLibunwind
+++ b/UpdateLibunwind
@@ -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
diff --git a/vendor/libunwind/cmake/Modules/LLVMVersion.cmake b/vendor/libunwind/cmake/Modules/LLVMVersion.cmake
index 93d3673..2e68562 100644
--- a/vendor/libunwind/cmake/Modules/LLVMVersion.cmake
+++ b/vendor/libunwind/cmake/Modules/LLVMVersion.cmake
@@ -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)
diff --git a/vendor/libunwind/llvm/cmake/modules/Findzstd.cmake b/vendor/libunwind/llvm/cmake/modules/Findzstd.cmake
index 4bc0b79..f6ca5d1 100644
--- a/vendor/libunwind/llvm/cmake/modules/Findzstd.cmake
+++ b/vendor/libunwind/llvm/cmake/modules/Findzstd.cmake
@@ -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 "")