Skip to content

Commit 6334bf1

Browse files
patch 4
1 parent ab44f41 commit 6334bf1

1 file changed

Lines changed: 14 additions & 19 deletions

File tree

depends/packages/boost.mk

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1
1212

1313
$(package)_config_opts_linux=threadapi=pthread runtime-link=shared
1414

15-
$(package)_config_opts_darwin=--toolset=clang runtime-link=shared
15+
# IMPORTANT: macOS now forced to GCC toolset
16+
$(package)_config_opts_darwin=--toolset=gcc runtime-link=shared
1617

1718
$(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static
1819

@@ -36,25 +37,19 @@ $(package)_cxxflags=-std=c++11 -fvisibility=hidden
3637
$(package)_cxxflags_linux=-fPIC
3738
endef
3839

40+
# ==================================================================
41+
# PREPROCESS: FORCE GCC TOOLSET FOR MACOS + EVERY OTHER HOST
42+
# macOS cross compile will use gcc toolset with g++ invocation
43+
# This avoids Boost's broken "darwin" toolset and missing libtool.
44+
# ==================================================================
3945
define $(package)_preprocess_cmds
40-
41-
if [ "$(host_os)" = "darwin" ]; then \
42-
echo "using clang : : $($(package)_cxx) \
43-
: <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" \
44-
<linkflags>\"$($(package)_ldflags)\" \
45-
<archiver>\"$($(package)_ar)\" \
46-
<ranlib>\"$(host_RANLIB)\" \
47-
<striper>\"$(host_STRIP)\" \
48-
;" > user-config.jam; \
49-
else \
50-
echo "using gcc : : $($(package)_cxx) \
51-
: <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" \
52-
<linkflags>\"$($(package)_ldflags)\" \
53-
<archiver>\"$($(package)_ar)\" \
54-
<ranlib>\"$(host_RANLIB)\" \
55-
<striper>\"$(host_STRIP)\" \
56-
;" > user-config.jam; \
57-
fi
46+
echo "using gcc : : $($(package)_cxx) \
47+
: <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" \
48+
<linkflags>\"$($(package)_ldflags)\" \
49+
<archiver>\"$($(package)_ar)\" \
50+
<ranlib>\"$(host_RANLIB)\" \
51+
<striper>\"$(host_STRIP)\" \
52+
;" > user-config.jam
5853
endef
5954

6055
define $(package)_config_cmds

0 commit comments

Comments
 (0)