Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/moses-smt/mosesdecoder.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Heafield <github@kheafield.com>2012-07-03 20:14:41 +0400
committerKenneth Heafield <github@kheafield.com>2012-07-03 20:14:41 +0400
commitb9d4cc9af37ef9c3b72a28d74022d5e4556439bf (patch)
tree7287548b1e1db06caaa3075010b16530e1181638 /jam-files
parente7faa978b0dfaa04974682b1915ff7c8a8b8222e (diff)
Alexander Fraser: Boost thread depends on Boost system.
Diffstat (limited to 'jam-files')
-rw-r--r--jam-files/sanity.jam11
1 files changed, 6 insertions, 5 deletions
diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam
index 1080f9f3d..1bdee3dca 100644
--- a/jam-files/sanity.jam
+++ b/jam-files/sanity.jam
@@ -91,15 +91,15 @@ else {
#Are we linking static binaries against shared boost?
boost-auto-shared = [ auto-shared "boost_program_options" : $(L-boost-search) ] ;
#Convenience rule for boost libraries. Defines library boost_$(name).
-rule boost-lib ( name macro ) {
+rule boost-lib ( name macro : deps * ) {
#Link multi-threaded programs against the -mt version if available. Old
#versions of boost do not have -mt tagged versions of all libraries. Sadly,
#boost.jam does not handle this correctly.
if [ test_flags $(L-boost-search)" -lboost_"$(name)"-mt" ] {
- lib inner_boost_$(name) : : <threading>single $(boost-search) <name>boost_$(name) ;
- lib inner_boost_$(name) : : <threading>multi $(boost-search) <name>boost_$(name)-mt ;
+ lib inner_boost_$(name) : $(deps) : <threading>single $(boost-search) <name>boost_$(name) ;
+ lib inner_boost_$(name) : $(deps) : <threading>multi $(boost-search) <name>boost_$(name)-mt ;
} else {
- lib inner_boost_$(name) : : $(boost-search) <name>boost_$(name) ;
+ lib inner_boost_$(name) : $(deps) : $(boost-search) <name>boost_$(name) ;
}
alias boost_$(name) : inner_boost_$(name) : $(boost-auto-shared) : : <link>shared:<define>BOOST_$(macro) $(boost-include) ;
@@ -118,7 +118,8 @@ rule boost ( min-version ) {
exit You have Boost $(boost-version). This package requires Boost at least $(min-version) (and preferably newer). : 1 ;
}
#See tools/build/v2/contrib/boost.jam in a boost distribution for a table of macros to define.
- boost-lib thread THREAD_DYN_DLL ;
+ boost-lib system SYSTEM_DYN_LINK ;
+ boost-lib thread THREAD_DYN_DLL : boost_system ;
boost-lib program_options PROGRAM_OPTIONS_DYN_LINK ;
boost-lib unit_test_framework TEST_DYN_LINK ;
boost-lib iostreams IOSTREAMS_DYN_LINK ;