Apply Jamroot/boostcpp.jam patches

2 files changed, 10 insertions, 5 deletions

diff --git a/Jamroot b/Jamroot
index d521e5eb5a..e81456cc1b 100644
--- a/Jamroot
+++ b/Jamroot
@@ -201,10 +201,15 @@ rule handle-static-runtime ( properties * )
     if <link>shared in $(properties) && <runtime-link>static in $(properties) &&
         ! ( <toolset>cw in $(properties) )
     {
-        ECHO "error: link=shared together with runtime-link=static is not allowed" ;
-        ECHO "error: such property combination is either impossible " ;
-        ECHO "error: or too dangerious to be of any use" ;
-        EXIT ;
+        if ! $(.shared-static-warning-emitted)
+        {
+            ECHO "warning: skipping configuration link=shared, runtime-link=static" ;
+            ECHO "warning: this combination is either impossible or too dangerous" ;
+            ECHO "warning: to be of any use" ;
+            .shared-static-warning-emitted = 1 ;
+        }
+
+        return <build>no ;
     }
 }
 
diff --git a/boostcpp.jam b/boostcpp.jam
index 38113c46c6..02ce085c12 100644
--- a/boostcpp.jam
+++ b/boostcpp.jam
@@ -372,7 +372,7 @@ class top-level-target : alias-target-class
 
         self.complete-properties = [ property-set.create
             <variant>debug <variant>release
-            <threading>single <threading>multi
+            <threading>multi
             <link>shared <link>static
             <runtime-link>shared <runtime-link>static ] ;
     }