From d2546cc59202604f37b58f1254c5e4fd7a93995b Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Tue, 10 Feb 2015 04:00:44 +0000
Subject: [PATCH] test coverage fix in Jamfile

---
 Jamfile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Jamfile b/Jamfile
index 7e3b10714..5a66d780b 100755
--- a/Jamfile
+++ b/Jamfile
@@ -28,6 +28,11 @@ VERSION = 1.1.0 ;
 rule coverage ( properties * )
 {
 	local result ;
+	if ! <test-coverage>on
+	{
+		return $(result) ;
+	}
+
 	if <toolset>gcc in $(properties)
 		|| <toolset>darwin in $(properties)
 		|| <toolset>clang in $(properties)
@@ -35,7 +40,6 @@ rule coverage ( properties * )
 		result += <cxxflags>-fprofile-arcs <cxxflags>-ftest-coverage ;
 
 		if <toolset>gcc in $(properties)
-			|| <toolset>darwin in $(properties)
 		{
 			result += <linkflags>-lgcov ;
 		}
@@ -426,8 +430,7 @@ feature boost-link : static shared : propagated composite ;
 feature debug-iterators : off on : composite propagated link-incompatible ;
 feature.compose <debug-iterators>on : <define>_SCL_SECURE=1 <define>_GLIBCXX_DEBUG ;
 
-feature test-coverage : off on : composite propagated ;
-feature.compose <test-coverage>on : <conditional>@coverage ;
+feature test-coverage : off on : composite propagated link-incompatible ;
 
 feature fpic : off on : composite propagated link-incompatible ;
 feature.compose <fpic>on : <cflags>-fPIC ;
@@ -670,6 +673,7 @@ local usage-requirements =
 # enable cancel support in asio
 	<define>BOOST_ASIO_ENABLE_CANCELIO
 	<conditional>@linking
+	<conditional>@coverage
 # these compiler settings just makes the compiler standard conforming
 	<toolset>msvc:<cflags>/Zc:wchar_t
 	<toolset>msvc:<cflags>/Zc:forScope