diff options
| author | Hieu Hoang <hieuhoang@gmail.com> | 2014-09-22 13:56:14 +0400 |
|---|---|---|
| committer | Hieu Hoang <hieuhoang@gmail.com> | 2014-09-22 13:56:14 +0400 |
| commit | c8d6ff05bd8a8735d9915775e4713636a50da22d (patch) | |
| tree | bf69522995a3d1e9a244dfe295471c72db00a5ef /jam-files/sanity.jam | |
| parent | 59cd4be2c96733e999200550c29116c93fa6a1f8 (diff) | |
don't ever link to libboost*-mt
Diffstat (limited to 'jam-files/sanity.jam')
| -rw-r--r-- | jam-files/sanity.jam | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam index 79fd0ce1c..173444ef1 100644 --- a/jam-files/sanity.jam +++ b/jam-files/sanity.jam @@ -131,10 +131,7 @@ if $(with-macports) { #Convenience rule for boost libraries. Defines library boost_$(name). 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. - flags = $(L-boost-search)" -lboost_"$(name)"-mt$(boost-lib-version)" ; + flags = $(L-boost-search)" -lboost_"$(name)"$(boost-lib-version)" ; local main ; if $(name) = "unit_test_framework" { main = "BOOST_AUTO_TEST_CASE(foo) {}" ; @@ -147,7 +144,7 @@ rule boost-lib ( name macro : deps * ) { } if [ test_flags $(flags) : $(main) ] { lib inner_boost_$(name) : : <threading>single $(boost-search) <name>boost_$(name)$(boost-lib-version) : <link>static : <library>$(deps) ; - lib inner_boost_$(name) : : <threading>multi $(boost-search) <name>boost_$(name)-mt$(boost-lib-version) : <link>static : <library>$(deps) ; + lib inner_boost_$(name) : : <threading>multi $(boost-search) <name>boost_$(name)$(boost-lib-version) : <link>static : <library>$(deps) ; } else { lib inner_boost_$(name) : : $(boost-search) <name>boost_$(name)$(boost-lib-version) : : <library>$(deps) ; } |