test 4

Author: CryptoLover705

depends/packages/boost.mk

@@ -12,69 +12,95 @@ $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1
 
 $(package)_config_opts_linux=threadapi=pthread runtime-link=shared
 
-# macOS uses darwin toolset
-$(package)_config_opts_darwin=toolset=darwin runtime-link=shared
+# macOS: required for cross-compile
+$(package)_config_opts_darwin=toolset=clang 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)
+
+# override on Darwin
+$(package)_toolset_darwin=clang
+$(package)_archiver_darwin=$($(package)_ar)
+
+boost_toolset_darwin=$($(package)_toolset_darwin)
+boost_archiver_darwin=$($(package)_archiver_darwin)
+
 $(package)_config_libraries=chrono,filesystem,program_options,system,thread
 
 $(package)_cxxflags=-std=c++11 -fvisibility=hidden
 $(package)_cxxflags_linux=-fPIC
 
+# required for Darwin SDK includes
 $(package)_cppflags+= --sysroot=$(OSX_SDK_PATH)
 $(package)_cflags+= --sysroot=$(OSX_SDK_PATH)
 $(package)_ldflags+= -Wl,-syslibroot,$(OSX_SDK_PATH)
 endef
 
 # ==================================================================
-# PREPROCESS — Generate user-config.jam
+# PREPROCESS — Generate user-config.jam for clang (macOS) / gcc (others)
 # ==================================================================
 
 ifeq ($(host_os),darwin)
 
 define $(package)_preprocess_cmds
+  # 1) Native gcc toolset for building the Boost.Build engine (b2)
   echo "using gcc : : g++ ;" > user-config.jam
-  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>\"$(host_AR)\" \
-        <ranlib>\"$(host_RANLIB)\" \
-        <striper>\"$(host_STRIP)\" ;" >> user-config.jam
+  # 2) Cross clang toolset for building macOS Boost libs
+  echo "using clang : : $($(package)_cxx) \
+    : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags) -stdlib=libc++ -isystem$(OSX_SDK_PATH)/usr/include/c++/v1\" \
+      <linkflags>\"$($(package)_ldflags) -stdlib=libc++\" \
+      <archiver>\"$($(package)_ar)\" \
+      <ranlib>\"$(host_RANLIB)\" \
+      <striper>\"$(host_STRIP)\" \
+    ;" >> user-config.jam
 endef
 
-else
+else  # non-macOS
 
 define $(package)_preprocess_cmds
   echo "using gcc : : $($(package)_cxx) \
-      : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" \
-        <linkflags>\"$($(package)_ldflags)\" \
-        <archiver>\"$(package)_ar\" \
-        <ranlib>\"$(host_RANLIB)\" \
-        <striper>\"$(host_STRIP)\" ;" > user-config.jam
+    : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" \
+      <linkflags>\"$($(package)_ldflags)\" \
+      <archiver>\"$($(package)_ar)\" \
+      <ranlib>\"$(host_RANLIB)\" \
+      <striper>\"$(host_STRIP)\" \
+    ;" > user-config.jam
 endef
 
 endif
 
 # ==================================================================
-# CONFIG — bootstrap MUST use native compiler
+# CONFIG — Do NOT force --with-toolset on macOS (let it use native gcc)
 # ==================================================================
 
+ifeq ($(host_os),darwin)
+
 define $(package)_config_cmds
-  CC=gcc CXX=g++ ./bootstrap.sh --without-icu --with-libraries=$(boost_config_libraries)
+  ./bootstrap.sh --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
+# BUILD + INSTALL
 # ==================================================================
 
 define $(package)_build_cmds
-  ./b2 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) stage
+  ./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) stage
 endef
 
 define $(package)_stage_cmds
-  ./b2 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install
+  ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install
 endef