aboutsummaryrefslogtreecommitdiff
path: root/depends
diff options
context:
space:
mode:
authorCarl Dong <contact@carldong.me>2020-08-08 17:32:37 -0400
committerCarl Dong <contact@carldong.me>2020-11-23 15:50:57 -0500
commitab9e047cc2226198d22384c286cb30c4c7d51e83 (patch)
treeb03023dd32ad284e0ba0a52452e4e42ed543ecf3 /depends
parent86002e7e90d7c78d5a76a159bf17db48aec94f94 (diff)
downloadbitcoin-ab9e047cc2226198d22384c286cb30c4c7d51e83.tar.xz
depends: boost: Cleanup toolset selection
Diffstat (limited to 'depends')
-rw-r--r--depends/packages/boost.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk
index 9a32c796cf..cf2ef53fbb 100644
--- a/depends/packages/boost.mk
+++ b/depends/packages/boost.mk
@@ -13,14 +13,14 @@ $(package)_config_opts+=threading=multi link=static -sNO_COMPRESSION=1
$(package)_config_opts_linux=target-os=linux threadapi=pthread runtime-link=shared
$(package)_config_opts_darwin=target-os=darwin runtime-link=shared
$(package)_config_opts_mingw32=target-os=windows binary-format=pe threadapi=win32 runtime-link=static
-$(package)_toolset_$(host_os)=gcc
-$(package)_toolset_darwin=clang
$(package)_config_opts_x86_64=architecture=x86 address-model=64
$(package)_config_opts_i686=architecture=x86 address-model=32
$(package)_config_opts_aarch64=address-model=64
$(package)_config_opts_armv7a=address-model=32
ifneq (,$(findstring clang,$($(package)_cxx)))
- $(package)_toolset_$(host_os)=clang
+$(package)_toolset_$(host_os)=clang
+else
+$(package)_toolset_$(host_os)=gcc
endif
$(package)_archiver_$(host_os)=$($(package)_ar)
$(package)_config_libraries=filesystem,system,thread,test