diff options
author | Kenneth Heafield <kenlm@kheafield.com> | 2011-11-21 21:41:14 +0400 |
---|---|---|
committer | Kenneth Heafield <kenlm@kheafield.com> | 2011-11-21 21:41:14 +0400 |
commit | 0c239662bf8634d86c0b85ea78eae1a0208d1bcf (patch) | |
tree | 30c0e7be086c2fcfcbf38709257721fc20f3df64 /Jamroot | |
parent | da89f1e9b9963a92b4b9ed4d69840a2d9c229623 (diff) |
Go back to using boost.jam. It does -mt right.
Diffstat (limited to 'Jamroot')
-rw-r--r-- | Jamroot | 19 |
1 files changed, 7 insertions, 12 deletions
@@ -30,24 +30,19 @@ path-constant TOP : . ; import option ; +import boost ; +boost.use-project ; #If boost static libraries are not installed, use dynamic linking. if [ SHELL $(TOP)"/jam-files/test.sh -static -lboost_program_options" ] != 0 { force-boost-link = "<link>shared" ; } #Convenience rule for boost libraries. Defines library boost_$(name). -#If multi-threaded, links against the -mt version. -#With shared linkage, defines macro. See tools/build/v2/contrib/boost.jam in a -#boost tarball for a table of dynamic linking macros. -rule boost_lib ( name macro ) { -#Add -mt if multi-threaded. - lib inner_boost_$(name) : : <threading>single <name>boost_$(name) ; - lib inner_boost_$(name) : : <threading>multi <name>boost_$(name)-mt ; -#Link dynamically if necessary and define the dynamic linking macro if so - alias boost_$(name) : inner_boost_$(name) : $(force-boost-link) : : <link>shared:<define>BOOST_$(macro) ; +rule boost_lib ( name ) { + alias boost_$(name) : /boost//$(name) : $(force-boost-link) ; } -boost_lib thread THREAD_DYN_DLL ; -boost_lib program_options PROGRAM_OPTIONS_DYN_LINK ; -boost_lib unit_test_framework TEST_DYN_LINK ; +boost_lib thread ; +boost_lib program_options ; +boost_lib unit_test_framework ; #Dynamic libz if we have to. if [ SHELL $(TOP)"/jam-files/test.sh -static -lz" ] != 0 { |