Skip to content

Commit aa8b93e

Browse files
committed
Update boost.mk
1 parent 2a993f2 commit aa8b93e

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

depends/packages/boost.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ $(package)_config_opts_x86_64=architecture=x86 address-model=64
1717
$(package)_config_opts_i686=architecture=x86 address-model=32
1818
$(package)_config_opts_aarch64=address-model=64
1919
$(package)_config_opts_armv7a=address-model=32
20-
ifneq (,$(findstring clang,$($(package)_cxx)))
21-
$(package)_toolset_$(host_os)=clang
22-
else
23-
$(package)_toolset_$(host_os)=gcc
24-
endif
2520
$(package)_config_libraries=chrono,filesystem,program_options,system,thread,test
2621
$(package)_cxxflags+=-std=c++17
2722
$(package)_cxxflags_linux=-fPIC

depends/packages/native_b2.mk

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,9 @@ $(package)_download_path=$(boost_download_path)
44
$(package)_file_name=$(boost_file_name)
55
$(package)_sha256_hash=$(boost_sha256_hash)
66
$(package)_build_subdir=tools/build/src/engine
7-
ifneq (,$(findstring clang,$($(package)_cxx)))
8-
$(package)_toolset_$(host_os)=clang
9-
else
10-
$(package)_toolset_$(host_os)=gcc
11-
endif
127

138
define $(package)_build_cmds
14-
CXX="$($(package)_cxx)" CXXFLAGS="$($(package)_cxxflags)" ./build.sh "$($(package)_toolset_$(host_os))"
9+
CXX="$($(package)_cxx)" CXXFLAGS="$($(package)_cxxflags)" ./build.sh
1510
endef
1611

1712
define $(package)_stage_cmds

0 commit comments

Comments
 (0)