aboutsummaryrefslogtreecommitdiff
path: root/depends
diff options
context:
space:
mode:
authorCarl Dong <contact@carldong.me>2020-08-08 17:31:58 -0400
committerCarl Dong <contact@carldong.me>2020-11-23 15:50:56 -0500
commit86002e7e90d7c78d5a76a159bf17db48aec94f94 (patch)
tree58e882434e52bf8d237e5b4c706b2bdfb948f508 /depends
parentd7048fa73fafaf0d89d891d98e51a251a64a1495 (diff)
downloadbitcoin-86002e7e90d7c78d5a76a159bf17db48aec94f94.tar.xz
depends: boost: Cleanup architecture/address-model
Diffstat (limited to 'depends')
-rw-r--r--depends/packages/boost.mk11
1 files changed, 4 insertions, 7 deletions
diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk
index 81c39182a0..9a32c796cf 100644
--- a/depends/packages/boost.mk
+++ b/depends/packages/boost.mk
@@ -13,15 +13,12 @@ $(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)_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)_config_opts_i686_android=address-model=32
-$(package)_config_opts_aarch64_android=address-model=64
-$(package)_config_opts_x86_64_android=address-model=64
-$(package)_config_opts_armv7a_android=address-model=32
$(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
endif