What changed, and why it matters
This commit updates the build system for macOS releases. It bumps the Apple SDK and compiler toolchain from Xcode 15 / Clang 19 to Xcode 26.1.1 / Clang 22, adds a small patch to disable a newer macOS cursor API in Qt, and adjusts CMake configuration to handle compiler paths with spaces. There is no indication this fixes or introduces a security vulnerability; it is routine build-maintenance work.
No security action required. Treat as normal build-system maintenance; verify reproducible builds still pass after the toolchain bump if you rely on deterministic release binaries.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The diff is a Guix/depends build-system refresh for Darwin targets: SDK version and SHA-256 updated to Xcode 26.1.1 (17B100), clang-toolchain and lld updated from 19 to 22, darwin_CXXFLAGS gains -Xclang -fno-cxx-modules, a new Qt patch (fix-qcacoacursor.patch) disables a macOS 15+ cursor API branch by forcing the preprocessor guard to #if 0, and toolchain.cmake.in adds a split_program helper to parse compiler strings containing spaces. The monero submodule pointer also changed. No runtime cryptographic, wallet, or network code is modified.
Changed components
contrib/depends/hosts/darwin.mkcontrib/depends/packages/darwin_sdk.mkcontrib/depends/packages/qt.mkcontrib/depends/patches/qt/fix-qcacoacursor.patchcontrib/depends/toolchain.cmake.incontrib/guix/manifest.scmmonero submoduleInspect captured patch +50 / −12
diff --git a/contrib/depends/hosts/darwin.mk b/contrib/depends/hosts/darwin.mk
index 3a1009b..d6a9d95 100644
--- a/contrib/depends/hosts/darwin.mk
+++ b/contrib/depends/hosts/darwin.mk
@@ -1,7 +1,7 @@
OSX_MIN_VERSION=14.0
OSX_SDK_VERSION=14.0
-XCODE_VERSION=15.0
-XCODE_BUILD_ID=15A240d
+XCODE_VERSION=26.1.1
+XCODE_BUILD_ID=17B100
LLD_VERSION=711
OSX_SDK=$(host_prefix)/native/SDK
@@ -66,7 +66,7 @@ darwin_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
$(clangxx_prog) $(darwin_CXX_)
darwin_CFLAGS=-pipe
-darwin_CXXFLAGS=-pipe
+darwin_CXXFLAGS=-pipe -Xclang -fno-cxx-modules
darwin_LDFLAGS=-Wl,-platform_version,macos,$(OSX_MIN_VERSION),$(OSX_SDK_VERSION) -fuse-ld=lld
darwin_ARFLAGS=cr
diff --git a/contrib/depends/packages/darwin_sdk.mk b/contrib/depends/packages/darwin_sdk.mk
index 1bedd61..3b72357 100644
--- a/contrib/depends/packages/darwin_sdk.mk
+++ b/contrib/depends/packages/darwin_sdk.mk
@@ -1,8 +1,8 @@
package=darwin_sdk
-$(package)_version=15.0
+$(package)_version=26.1.1
$(package)_download_path=https://bitcoincore.org/depends-sources/sdks
-$(package)_file_name=Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers.tar.gz
-$(package)_sha256_hash=c0c2e7bb92c1fee0c4e9f3a485e4530786732d6c6dd9e9f418c282aa6892f55d
+$(package)_file_name=Xcode-26.1.1-17B100-extracted-SDK-with-libcxx-headers.tar
+$(package)_sha256_hash=9600fa93644df674ee916b5e2c8a6ba8dacf631996a65dc922d003b98b5ea3b1
define $(package)_stage_cmds
mkdir -p $($(package)_staging_dir)/$(host_prefix)/native/SDK &&\
diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk
index f9da57f..6e95fcb 100644
--- a/contrib/depends/packages/qt.mk
+++ b/contrib/depends/packages/qt.mk
@@ -14,6 +14,7 @@ $(package)_patches += windows_func_fix.patch
$(package)_patches += libxau-fix.patch
$(package)_patches += toolchain.cmake
$(package)_patches += fix_static_qt_darwin_camera_permissions.patch
+$(package)_patches += fix-qcacoacursor.patch
#$(package)_patches += fix-static-fontconfig-static-linking.patch
$(package)_qttools_file_name=qttools-$($(package)_suffix)
@@ -216,6 +217,7 @@ define $(package)_preprocess_cmds
cd qtbase && \
patch -p1 -i $($(package)_patch_dir)/libxau-fix.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_static_qt_darwin_camera_permissions.patch && \
+ patch -p1 -i $($(package)_patch_dir)/fix-qcacoacursor.patch && \
cd ../qtmultimedia && \
patch -p1 -i $($(package)_patch_dir)/v4l2.patch
endef
diff --git a/contrib/depends/patches/qt/fix-qcacoacursor.patch b/contrib/depends/patches/qt/fix-qcacoacursor.patch
new file mode 100644
index 0000000..1df619a
--- /dev/null
+++ b/contrib/depends/patches/qt/fix-qcacoacursor.patch
@@ -0,0 +1,13 @@
+diff --git a/src/plugins/platforms/cocoa/qcocoacursor.mm b/src/plugins/platforms/cocoa/qcocoacursor.mm
+index b044e17df82..6811958ec0b 100644
+--- a/src/plugins/platforms/cocoa/qcocoacursor.mm
++++ b/src/plugins/platforms/cocoa/qcocoacursor.mm
+@@ -155,7 +155,7 @@ NSCursor *QCocoaCursor::convertCursor(QCursor *cursor)
+ case Qt::SizeHorCursor:
+ case Qt::SizeBDiagCursor:
+ case Qt::SizeFDiagCursor: {
+-#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(150000)
++#if 0
+ if (@available(macOS 15, *)) {
+ auto position = [newShape]{
+ switch (newShape) {
diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in
index 5ba0697..0dbb0d3 100644
--- a/contrib/depends/toolchain.cmake.in
+++ b/contrib/depends/toolchain.cmake.in
@@ -79,6 +79,25 @@ set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) # Find libs in target
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) # Find includes in target
+function(split_program input_string program arguments)
+ # CMake < 3.19 only understands setting CMAKE_<LANG>_COMPILER using "<program>" "<arguments>".
+ # https://cmake.org/cmake/help/v3.19/variable/CMAKE_LANG_COMPILER.html#variable:CMAKE_%3CLANG%3E_COMPILER
+
+ string(FIND "${input_string}" " " space_index)
+
+ if(space_index EQUAL -1)
+ set(${program} "${input_string}" PARENT_SCOPE)
+ set(${arguments} "" PARENT_SCOPE)
+ else()
+ string(SUBSTRING "${input_string}" 0 ${space_index} _program)
+ math(EXPR args_index "${space_index} + 1")
+ string(SUBSTRING "${input_string}" ${args_index} -1 _arguments)
+
+ set(${program} "${_program}" PARENT_SCOPE)
+ set(${arguments} "${_arguments}" PARENT_SCOPE)
+ endif()
+endfunction()
+
# specify the cross compiler to be used. Darwin uses clang provided by the SDK.
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
if(ARCHITECTURE STREQUAL "aarch64")
@@ -96,10 +115,13 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
endif()
SET(CMAKE_SYSTEM_VERSION 23.0.0)
SET(_CMAKE_TOOLCHAIN_PREFIX @prefix@/native/bin/${CONF_TRIPLE}-)
- SET(CMAKE_C_COMPILER @CC@)
+ split_program("@CC@" CC_DARWIN CC_DARWIN_ARGS)
+ SET(CMAKE_C_COMPILER "${CC_DARWIN}" "${CC_DARWIN_ARGS}")
SET(CMAKE_C_COMPILER_TARGET ${CLANG_TARGET})
+ split_program("@CXX@" CXX_DARWIN CXX_DARWIN_ARGS)
+ SET(CMAKE_CXX_COMPILER "${CXX_DARWIN}" "${CXX_DARWIN_ARGS}")
SET(CMAKE_C_FLAGS "@CFLAGS@")
- SET(CMAKE_CXX_COMPILER @CXX@ -stdlib=libc++)
+ SET(CMAKE_CXX_COMPILER_TARGET ${CLANG_TARGET})
SET(CMAKE_CXX_FLAGS "@CXXFLAGS@")
SET(CMAKE_EXE_LINKER_FLAGS "@LDFLAGS@")
SET(CMAKE_MODULE_LINKER_FLAGS "@LDFLAGS@")
@@ -107,6 +129,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
SET(CMAKE_INSTALL_NAME_TOOL llvm-install-name-tool)
SET(CMAKE_ASM_COMPILER clang)
SET(CMAKE_ASM-ATT_COMPILER llvm-as)
+ SET(CMAKE_ASM-ATT_COMPILER llvm-as)
SET(CMAKE_ASM_COMPILER_TARGET ${CLANG_TARGET})
SET(CMAKE_ASM-ATT_COMPILER_TARGET ${CLANG_TARGET})
SET(CMAKE_AR llvm-ar)
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
index 868bba2..ff4591b 100644
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -315,9 +315,9 @@ thus should be able to compile on most platforms where these exist.")
))
((string-contains target "darwin")
(list
- clang-toolchain-19
- lld-19
- (make-lld-wrapper lld-19 #:lld-as-ld? #t)
+ clang-toolchain-22
+ lld-22
+ (make-lld-wrapper lld-22 #:lld-as-ld? #t)
p7zip ;; needed to extract tor_darwin .dmg
))
(else '())))))
Why this scored 15/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.