From d8662ad41e4208dc492f4ea720d4a6144aef81e9 Mon Sep 17 00:00:00 2001
From: SChernykh <15806605+SChernykh@users.noreply.github.com>
Date: Sat, 25 Oct 2025 17:32:12 +0200
Subject: [PATCH] Updated build scripts

---
 .github/workflows/c-cpp.yml               |  4 ++--
 cmake/macos_aarch64_toolchain_clang.cmake |  8 ++++----
 cmake/macos_x86_64_toolchain_clang.cmake  |  8 ++++----
 scripts/release/images/ubuntu/prepare.sh  | 11 ++++++-----
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 599979e..e79bf1b 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -644,7 +644,7 @@ jobs:
     - name: Archive binary
       uses: actions/upload-artifact@v4
       with:
-        name: p2pool-macos-13
+        name: p2pool-macos
         path: build/p2pool
 
   build-macos-aarch64:
@@ -711,7 +711,7 @@ jobs:
     - name: Archive binary
       uses: actions/upload-artifact@v4
       with:
-        name: p2pool-macos-11-aarch64
+        name: p2pool-macos-aarch64
         path: build/p2pool
 
   build-freebsd:
diff --git a/cmake/macos_aarch64_toolchain_clang.cmake b/cmake/macos_aarch64_toolchain_clang.cmake
index 5a79391..1e09a3f 100644
--- a/cmake/macos_aarch64_toolchain_clang.cmake
+++ b/cmake/macos_aarch64_toolchain_clang.cmake
@@ -3,7 +3,7 @@ set(CMAKE_CROSSCOMPILING TRUE)
 
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
 
-set(CMAKE_C_COMPILER /usr/local/bin/aarch64-apple-darwin24.5-clang)
-set(CMAKE_CXX_COMPILER /usr/local/bin/aarch64-apple-darwin24.5-clang++)
-set(CMAKE_ASM_COMPILER /usr/local/bin/aarch64-apple-darwin24.5-as)
-set(CMAKE_STRIP /usr/local/bin/aarch64-apple-darwin24.5-strip)
+set(CMAKE_C_COMPILER /usr/local/bin/aarch64-apple-darwin25-clang)
+set(CMAKE_CXX_COMPILER /usr/local/bin/aarch64-apple-darwin25-clang++)
+set(CMAKE_ASM_COMPILER /usr/local/bin/aarch64-apple-darwin25-as)
+set(CMAKE_STRIP /usr/local/bin/aarch64-apple-darwin25-strip)
diff --git a/cmake/macos_x86_64_toolchain_clang.cmake b/cmake/macos_x86_64_toolchain_clang.cmake
index 8cc529a..fcfd705 100644
--- a/cmake/macos_x86_64_toolchain_clang.cmake
+++ b/cmake/macos_x86_64_toolchain_clang.cmake
@@ -3,7 +3,7 @@ set(CMAKE_CROSSCOMPILING TRUE)
 
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
 
-set(CMAKE_C_COMPILER /usr/local/bin/x86_64-apple-darwin24.5-clang)
-set(CMAKE_CXX_COMPILER /usr/local/bin/x86_64-apple-darwin24.5-clang++)
-set(CMAKE_ASM_COMPILER /usr/local/bin/x86_64-apple-darwin24.5-as)
-set(CMAKE_STRIP /usr/local/bin/x86_64-apple-darwin24.5-strip)
+set(CMAKE_C_COMPILER /usr/local/bin/x86_64-apple-darwin25-clang)
+set(CMAKE_CXX_COMPILER /usr/local/bin/x86_64-apple-darwin25-clang++)
+set(CMAKE_ASM_COMPILER /usr/local/bin/x86_64-apple-darwin25-as)
+set(CMAKE_STRIP /usr/local/bin/x86_64-apple-darwin25-strip)
diff --git a/scripts/release/images/ubuntu/prepare.sh b/scripts/release/images/ubuntu/prepare.sh
index 5aadd29..45f6bb7 100755
--- a/scripts/release/images/ubuntu/prepare.sh
+++ b/scripts/release/images/ubuntu/prepare.sh
@@ -10,8 +10,9 @@ CMAKE_VERSION=4.1.2
 FREEBSD_VERSION=12.4
 GCC_VERSION=15.2.0
 GLIBC_VERSION=2.42
-LINUX_HEADERS_VERSION=6.17.4
-MACOSX_SDK_VERSION=15.5
+LINUX_HEADERS_VERSION=6.17.5
+MACOSX_SDK_VERSION=26.0
+OSXCROSS_VERSION=47936a512273bb3b414b5a2e83043c92eabc7ae7
 MAKE_VERSION=4.4.1
 MINGW_VERSION=13.0.0
 XZ_VERSION=5.8.1
@@ -22,8 +23,8 @@ CMAKE_SHA256="773cc679c3a7395413bd096523f8e5d6c39f8718af4e12eb4e4195f72f35e4ab"
 FREEBSD_AARCH64_SHA256="6c401819bfb93e810c9f9aa670a1e4685f924df5e7e0c9c6397dd6c16c954fa2"
 FREEBSD_X86_64_SHA256="581c7edacfd2fca2bdf5791f667402d22fccd8a5e184635e0cac075564d57aa8"
 GLIBC_SHA256="d1775e32e4628e64ef930f435b67bb63af7599acb6be2b335b9f19f16509f17f"
-HEADERS_SHA256="010a12296e6fba7597ff36681be2485fd3b1780ac8fd9e6a9f3cfe193f0491db"
-MACOSX_SDK_SHA256="c15cf0f3f17d714d1aa5a642da8e118db53d79429eb015771ba816aa7c6c1cbd"
+HEADERS_SHA256="c05faf36e9c2164be723cf6ada8533788804d48f9dd2fe1be2ccee3616a92bce"
+MACOSX_SDK_SHA256="07ccaa2891454713c3a230dd87283f76124193309d9a7617ebee45354c9302d2"
 MAKE_SHA256="dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3"
 TAR_SHA256="4d62ff37342ec7aed748535323930c7cf94acf71c3591882b26a7ea50f3edc16"
 
@@ -421,7 +422,7 @@ make install
 echo "Build MacOSX cross compilers"
 
 cd /root/osxcross
-git checkout cb444e230e815c06202bef1c30eca5d353235a05
+git checkout ${OSXCROSS_VERSION}
 
 TARGET_DIR=/usr/local OSX_VERSION_MIN=10.15 UNATTENDED=1 ./build.sh
 ./build_compiler_rt.sh