From 603589fde0ad81fc3687ecda0b046fb1f5260053 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Mon, 23 Jun 2025 06:58:01 +0800
Subject: Fix the vcpkg Boost libraries suffix on Win arm64

---
 indra/cmake/Boost.cmake       | 6 +++++-
 indra/cmake/LLPrimitive.cmake | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 5a9e10b38b..8459214f59 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -12,7 +12,11 @@ if (DARWIN)
 elseif (WINDOWS)
   target_include_directories( ll::boost SYSTEM INTERFACE ${prefix_result}/../include)
   target_link_directories( ll::boost INTERFACE ${prefix_result})
-  set(sfx -vc143-mt-x64-1_88)
+  if ($ENV{MSYSTEM_CARCH} MATCHES aarch64)
+    set(sfx -vc143-mt-a64-1_88)
+  else ()
+    set(sfx -vc143-mt-x64-1_88)
+  endif ()
 else ()
   find_package( Boost REQUIRED )
 endif ()
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 00e3c73851..e6adea477f 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -59,7 +59,11 @@ else ()
     elseif (WINDOWS)
       set(BOOST_CFLAGS -I${prefix_result}/../include)
       set(BOOST_LIBS -L${prefix_result})
-      set(BOOST_LIBRARY_SUFFIX -vc143-mt-x64-1_88)
+      if ($ENV{MSYSTEM_CARCH} MATCHES aarch64)
+        set(BOOST_LIBRARY_SUFFIX -vc143-mt-a64-1_88)
+      else ()
+        set(BOOST_LIBRARY_SUFFIX -vc143-mt-x64-1_88)
+      endif ()
     endif ()
     file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/collada/1.4)
     try_compile(COLLADADOM_RESULT
-- 
cgit v1.3