Skip to content

Commit 2ddf041

Browse files
committed
Merge #17928: depends: Consistent use of package variable
22c5a98 depends: Consistent use of package variable (Peter Bushnell) Pull request description: All other mk files use the package variable consistently except for the two instances here, which have always been here, since depends was introduced in 0.10. ACKs for top commit: fanquake: ACK 22c5a98 - tested a `make boost -C depends/ -j8`. Tree-SHA512: 41766a328603db2ebb1f23ea0c5b2936de043587dd86396eaba73524d2f5bdeff25447040e33d61de2ef612a920281cd81c6fac097913270287f344beb839c5d
2 parents 7fb94c0 + 22c5a98 commit 2ddf041

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

depends/packages/boost.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ $(package)_cxxflags_android=-fPIC
2929
endef
3030

3131
define $(package)_preprocess_cmds
32-
echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
32+
echo "using $($(package)_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$($(package)_archiver_$(host_os))\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
3333
endef
3434

3535
define $(package)_config_cmds
36-
./bootstrap.sh --without-icu --with-libraries=$(boost_config_libraries)
36+
./bootstrap.sh --without-icu --with-libraries=$($(package)_config_libraries)
3737
endef
3838

3939
define $(package)_build_cmds

0 commit comments

Comments
 (0)