test 2

Author: CryptoLover705

depends/packages/boost.mk

@@ -10,22 +10,22 @@ $(package)_config_opts_debug=variant=debug
 $(package)_config_opts=--layout=tagged --build-type=complete --user-config=user-config.jam
 $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1
 
+# ====== per-platform extra options ======
 $(package)_config_opts_linux=threadapi=pthread runtime-link=shared
 
-# macOS: tell b2 to use clang toolset (flags come from user-config.jam)
-$(package)_config_opts_darwin=toolset=clang runtime-link=shared
+# macOS: use the 'darwin' toolset, runtime shared
+$(package)_config_opts_darwin=toolset=darwin runtime-link=shared
 
 $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static
-
 $(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
 
 $(package)_toolset_$(host_os)=gcc
 $(package)_archiver_$(host_os)=$($(package)_ar)
 
-# darwin toolset override (for other uses)
-$(package)_toolset_darwin=clang
+# darwin “preferred” toolset name
+$(package)_toolset_darwin=darwin
 $(package)_archiver_darwin=$($(package)_ar)
 
 boost_toolset_darwin=$($(package)_toolset_darwin)
@@ -36,7 +36,7 @@ $(package)_config_libraries=chrono,filesystem,program_options,system,thread
 $(package)_cxxflags=-std=c++11 -fvisibility=hidden
 $(package)_cxxflags_linux=-fPIC
 
-# BOOST “FIX” FOR MISSING STANDARD HEADERS (used mainly on macOS)
+# macOS cross needs explicit sysroot and linker syslibroot
 $(package)_cppflags+= --sysroot=$(OSX_SDK_PATH)
 $(package)_cflags+= --sysroot=$(OSX_SDK_PATH)
 $(package)_ldflags+= -Wl,-syslibroot,$(OSX_SDK_PATH)
@@ -46,13 +46,14 @@ endef
 # PREPROCESS — Generate user-config.jam
 # ==================================================================
 
+# On macOS we use the 'darwin' toolset and the cross CXX from depends
 ifeq ($(host_os),darwin)
 
 define $(package)_preprocess_cmds
-  echo "using clang : : $($(package)_cxx) \
+  echo "using darwin : : $(host_CXX) \
     : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags) -stdlib=libc++ -isystem$(OSX_SDK_PATH)/usr/include/c++/v1\" \
       <linkflags>\"$($(package)_ldflags) -stdlib=libc++\" \
-      <archiver>\"$($(package)_ar)\" \
+      <archiver>\"$(host_AR)\" \
       <ranlib>\"$(host_RANLIB)\" \
       <striper>\"$(host_STRIP)\" \
     ;" > user-config.jam
@@ -73,22 +74,16 @@ endef
 endif
 
 # ==================================================================
-# CONFIG — Patch: Force --with-toolset=clang on macOS
+# CONFIG — IMPORTANT: no --with-toolset on macOS
 # ==================================================================
 
-ifeq ($(host_os),darwin)
-
-define $(package)_config_cmds
-  ./bootstrap.sh --with-toolset=clang --without-icu --with-libraries=$(boost_config_libraries)
-endef
-
-else
-
 define $(package)_config_cmds
   ./bootstrap.sh --without-icu --with-libraries=$(boost_config_libraries)
 endef
 
-endif
+# ==================================================================
+# BUILD + INSTALL
+# ==================================================================
 
 define $(package)_build_cmds
   ./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) stage