From 76323933252968f5deebd71daa5dcd646850bb5f Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Sat, 27 Apr 2013 19:35:41 +0000
Subject: [PATCH] merged jamfile fixes from RC_0_16

---
 Jamfile                 |  4 +++-
 bindings/python/Jamfile | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Jamfile b/Jamfile
index 7fc8433e5..ca91cc6db 100755
--- a/Jamfile
+++ b/Jamfile
@@ -257,7 +257,8 @@ rule building ( properties * )
 
 	if ( <toolset>darwin in $(properties)
 		|| <toolset>gcc in $(properties)
-		|| <toolset>clang in $(propertoes) )
+		|| <toolset>clang in $(propertoes)
+		|| <toolset>clang-darwin in $(propertoes) )
 		&& <link>shared in $(properties)
 		# on GCC, enabling debugging in libstdc++
 		# breaks the ABI and its ability to appear
@@ -596,6 +597,7 @@ local usage-requirements =
 	<toolset>gcc,<variant>debug:<cflags>-ftrapv
 	<toolset>darwin,<variant>debug:<cflags>-ftrapv
 	<toolset>clang:<cflags>-Wno-invalid-offsetof
+	<toolset>clang-darwin:<cflags>-Wno-invalid-offsetof
 	<boost>system:<cxxflags>$(CXXFLAGS)
 	<boost>system:<linkflags>$(LDFLAGS)
 # this works around a bug in asio in boost-1.39
diff --git a/bindings/python/Jamfile b/bindings/python/Jamfile
index f030ec337..d2a426f6f 100755
--- a/bindings/python/Jamfile
+++ b/bindings/python/Jamfile
@@ -15,22 +15,30 @@ rule libtorrent_linking ( properties * )
     }
 
     if <toolset>gcc in $(properties)
-		|| <toolset>darwin in $(properties)
-		|| <toolset>clang in $(properties)
+      || <toolset>darwin in $(properties)
+      || <toolset>clang in $(properties)
+      || <toolset>clang-darwin in $(properties)
     {
         result += <cxxflags>-fvisibility=hidden ;
     }
 
     if <boost>source in $(properties)
     {
-        if <boost-link>static in $(properties) || <link>static in $(properties)
+        if <boost-link>static in $(properties)
         {
             result += <library>/boost/python//boost_python/<link>static ;
-            result += <library>/torrent//torrent/<link>static ;
         }
         else
         {
             result += <library>/boost/python//boost_python/<link>shared ;
+        }
+
+        if <link>static in $(properties)
+        {
+            result += <library>/torrent//torrent/<link>static ;
+        }
+        else
+        {
             result += <library>/torrent//torrent/<link>shared/<boost-link>shared ;
         }
     }