From f4e391974eb527a09116c28679c4ff7176a16cc1 Mon Sep 17 00:00:00 2001 From: such-gitea Date: Sat, 24 Jan 2026 18:28:49 -0500 Subject: [PATCH] Update contrib/depends/packages/boost.mk --- contrib/depends/packages/boost.mk | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk index 7ade598af..56f482407 100644 --- a/contrib/depends/packages/boost.mk +++ b/contrib/depends/packages/boost.mk @@ -9,25 +9,31 @@ define $(package)_set_vars $(package)_config_opts_release=variant=release $(package)_config_opts_debug=variant=debug - # KEY FIX: Use 'system' layout to avoid weird naming (libboost_filesystem.a vs libboost_filesystem-mt-x64.a) $(package)_config_opts+=--layout=system --user-config=user-config.jam $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1 - # CRITICAL: Force static runtime for Linux to fix "Wrong Format" linker errors $(package)_config_opts_linux=threadapi=pthread runtime-link=static - $(package)_config_opts_darwin=target-os=darwin address-model=64 runtime-link=shared + + # Darwin (macOS) Defaults + $(package)_config_opts_darwin=target-os=darwin runtime-link=shared + + # Windows Defaults $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static + + # Architecture Specifics $(package)_config_opts_x86_64_mingw32=address-model=64 $(package)_config_opts_i686_mingw32=address-model=32 $(package)_config_opts_i686_linux=address-model=32 architecture=x86 + # MACOS ARM64 FIX: Explicitly tell B2 this is ARM + Mach-O + $(package)_config_opts_x86_64_darwin=address-model=64 + $(package)_config_opts_aarch64_darwin=address-model=64 architecture=arm binary-format=mach-o abi=aapcs + $(package)_toolset_$(host_os)=gcc $(package)_archiver_$(host_os)=$($(package)_ar) $(package)_toolset_darwin=darwin $(package)_archiver_darwin=$($(package)_libtool) - # CRITICAL: Added context, coroutine (for LWS) and C++17 (for Monero v18) - # Added 'atomic' and 'chrono' just to be safe for all platforms. $(package)_config_libraries=atomic,chrono,date_time,filesystem,program_options,regex,serialization,system,thread,locale,context,coroutine $(package)_cxxflags=-std=c++17 -fPIC endef