diff options
| author | fanquake <fanquake@gmail.com> | 2020-01-17 14:30:37 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-01-17 15:02:27 +0800 |
| commit | 2ddf041a8d5e2c9251da19c4b14259c1d318a442 (patch) | |
| tree | faf0bc9438937f03fac12ab264d686f3f63069fc | |
| parent | 7fb94c0ed418202ba0b49f5886bcf0c9cac22552 (diff) | |
| parent | 22c5a986e95d2bd14273465ca0e15fbe3772252d (diff) | |
| download | bitcoin-2ddf041a8d5e2c9251da19c4b14259c1d318a442.tar.xz | |
Merge #17928: depends: Consistent use of package variable
22c5a986e95d2bd14273465ca0e15fbe3772252d 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 22c5a986e95d2bd14273465ca0e15fbe3772252d - tested a `make boost -C depends/ -j8`.
Tree-SHA512: 41766a328603db2ebb1f23ea0c5b2936de043587dd86396eaba73524d2f5bdeff25447040e33d61de2ef612a920281cd81c6fac097913270287f344beb839c5d
| -rw-r--r-- | depends/packages/boost.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index d360bb5ba6..cd0e70fb1c 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -29,11 +29,11 @@ $(package)_cxxflags_android=-fPIC endef define $(package)_preprocess_cmds - 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 + 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 endef define $(package)_config_cmds - ./bootstrap.sh --without-icu --with-libraries=$(boost_config_libraries) + ./bootstrap.sh --without-icu --with-libraries=$($(package)_config_libraries) endef define $(package)_build_cmds |