Skip to content

Commit 3c622a3

Browse files
committed
revert: partial dash#5610 (make depends compilable with Xcode 15 on macos)
reverted commit: - aa7ba58
1 parent f15e1db commit 3c622a3

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

depends/packages/boost.mk

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,8 @@ $(package)_config_opts_i686_android=address-model=32
2121
$(package)_config_opts_aarch64_android=address-model=64
2222
$(package)_config_opts_x86_64_android=address-model=64
2323
$(package)_config_opts_armv7a_android=address-model=32
24-
unary_function=unary_function
2524
ifneq (,$(findstring clang,$($(package)_cxx)))
2625
$(package)_toolset_$(host_os)=clang
27-
ifeq ($(build_os),darwin)
28-
unary_function=__unary_function
29-
endif
3026
else
3127
$(package)_toolset_$(host_os)=gcc
3228
endif
@@ -39,9 +35,7 @@ $(package)_cxxflags_android=-fPIC
3935
$(package)_cxxflags_x86_64=-fcf-protection=full
4036
endef
4137

42-
# Fix missing unary_function in clang15 on macos, can be removed after upgrading to 1.81
4338
define $(package)_preprocess_cmds
44-
sed -i.old "s/unary_function/$(unary_function)/" boost/container_hash/hash.hpp && \
4539
echo "using $($(package)_toolset_$(host_os)) : : $($(package)_cxx) : <cflags>\"$($(package)_cflags)\" <cxxflags>\"$($(package)_cxxflags)\" <compileflags>\"$($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$($(package)_ar)\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
4640
endef
4741

0 commit comments

Comments
 (0)