From b81a582154b43ff57723884fd221c14001cf54cc Mon Sep 17 00:00:00 2001 From: SChernykh <15806605+SChernykh@users.noreply.github.com> Date: Thu, 20 Nov 2025 14:30:02 +0100 Subject: [PATCH] Build scripts: updated versions --- cmake/macos_aarch64_toolchain_clang.cmake | 8 ++++---- cmake/macos_x86_64_toolchain_clang.cmake | 8 ++++---- scripts/release/images/ubuntu/prepare.sh | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cmake/macos_aarch64_toolchain_clang.cmake b/cmake/macos_aarch64_toolchain_clang.cmake index 1e09a3f..9ad79c7 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-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) +set(CMAKE_C_COMPILER /usr/local/bin/aarch64-apple-darwin25.1-clang) +set(CMAKE_CXX_COMPILER /usr/local/bin/aarch64-apple-darwin25.1-clang++) +set(CMAKE_ASM_COMPILER /usr/local/bin/aarch64-apple-darwin25.1-as) +set(CMAKE_STRIP /usr/local/bin/aarch64-apple-darwin25.1-strip) diff --git a/cmake/macos_x86_64_toolchain_clang.cmake b/cmake/macos_x86_64_toolchain_clang.cmake index fcfd705..4c9332a 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-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) +set(CMAKE_C_COMPILER /usr/local/bin/x86_64-apple-darwin25.1-clang) +set(CMAKE_CXX_COMPILER /usr/local/bin/x86_64-apple-darwin25.1-clang++) +set(CMAKE_ASM_COMPILER /usr/local/bin/x86_64-apple-darwin25.1-as) +set(CMAKE_STRIP /usr/local/bin/x86_64-apple-darwin25.1-strip) diff --git a/scripts/release/images/ubuntu/prepare.sh b/scripts/release/images/ubuntu/prepare.sh index ba04d51..04c2fa5 100755 --- a/scripts/release/images/ubuntu/prepare.sh +++ b/scripts/release/images/ubuntu/prepare.sh @@ -6,12 +6,12 @@ set -e _7ZIP_VERSION=2501 BINUTILS_VERSION=2_45_1 CLANG_VERSION=21.1.6 -CMAKE_VERSION=4.1.2 +CMAKE_VERSION=4.2.0 FREEBSD_VERSION=12.4 GCC_VERSION=15.2.0 GLIBC_VERSION=2.42 LINUX_HEADERS_VERSION=6.17.8 -MACOSX_SDK_VERSION=26.0 +MACOSX_SDK_VERSION=26.1 OSXCROSS_VERSION=7e8a4d170cc6bda1f0a32f5dc5f6ace4676baf98 MAKE_VERSION=4.4.1 MINGW_VERSION=13.0.0 @@ -19,12 +19,12 @@ XZ_VERSION=5.8.1 TAR_VERSION=1.35 _7ZIP_SHA256="4ca3b7c6f2f67866b92622818b58233dc70367be2f36b498eb0bdeaaa44b53f4" -CMAKE_SHA256="773cc679c3a7395413bd096523f8e5d6c39f8718af4e12eb4e4195f72f35e4ab" +CMAKE_SHA256="bbcebd4c433eab3af03a8c80bb5d84e8dfc3ff8a4ab9d01547b21240c23f7c2c" FREEBSD_AARCH64_SHA256="6c401819bfb93e810c9f9aa670a1e4685f924df5e7e0c9c6397dd6c16c954fa2" FREEBSD_X86_64_SHA256="581c7edacfd2fca2bdf5791f667402d22fccd8a5e184635e0cac075564d57aa8" GLIBC_SHA256="d1775e32e4628e64ef930f435b67bb63af7599acb6be2b335b9f19f16509f17f" HEADERS_SHA256="5a8de64a75fca706c01c6c0a77cf75a74618439db195e25f1f0268af6b2fb1da" -MACOSX_SDK_SHA256="07ccaa2891454713c3a230dd87283f76124193309d9a7617ebee45354c9302d2" +MACOSX_SDK_SHA256="beee7212d265a6d2867d0236cc069314b38d5fb3486a6515734e76fa210c784c" MAKE_SHA256="dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3" TAR_SHA256="4d62ff37342ec7aed748535323930c7cf94acf71c3591882b26a7ea50f3edc16" @@ -227,7 +227,7 @@ cd /root tar xvf $CMAKE_FILE cp $CMAKE_NAME/bin/* /usr/local/bin -cp -r $CMAKE_NAME/share/cmake-4.1 /usr/local/share +cp -r $CMAKE_NAME/share/cmake-4.2 /usr/local/share echo "Install clang"