summaryrefslogtreecommitdiff
path: root/jam-files
diff options
context:
space:
mode:
Diffstat (limited to 'jam-files')
-rw-r--r--jam-files/sanity.jam14
1 files changed, 11 insertions, 3 deletions
diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam
index 2a5fc381..4e0432f9 100644
--- a/jam-files/sanity.jam
+++ b/jam-files/sanity.jam
@@ -87,6 +87,8 @@ else {
boost-include = ;
}
}
+
+requirements = ;
#Are we linking static binaries against shared boost?
boost-auto-shared = [ auto-shared "boost_program_options" : $(L-boost-search) ] ;
@@ -96,8 +98,15 @@ rule boost-lib ( name macro ) {
#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 ;
+# if [ test_flags $(L-boost-search)" -lboost_"$(name) ] {
+# lib inner_boost_$(name) : : <threading>single $(boost-search) <name>boost_$(name) ;
+# lib inner_boost_$(name) : : <threading>multi $(boost-search) <name>boost_$(name)-mt ;
+# } else {
+ if ! <threading>multi in $(requirements) {
+ requirements += <threading>multi ;
+ }
+ lib inner_boost_$(name) : : <threading>multi $(boost-search) <name>boost_$(name)-mt ;
+# }
} else {
lib inner_boost_$(name) : : $(boost-search) <name>boost_$(name) ;
}
@@ -149,7 +158,6 @@ rule external-lib ( name : search-path * ) {
local ignored = @($(build-log):E=$(script)) ;
}
-requirements = ;
{
#Boost jam's static clang is buggy.
requirements += <cxxflags>$(cxxflags) <cflags>$(cflags) <linkflags>$(ldflags) <toolset>clang:<link>shared ;