From be7e78c6bf6832f57905b48890520a5c7e3d7c3b Mon Sep 17 00:00:00 2001
From: Kenneth Heafield <github@kheafield.com>
Date: Wed, 14 Nov 2012 20:01:07 +0000
Subject: [PATCH] Use tcmalloc with multithread if detected.

Change option and documentation to --without-tcmalloc.
---
 Jamroot | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jamroot b/Jamroot
index 6b1ce6bac..62d940905 100644
--- a/Jamroot
+++ b/Jamroot
@@ -18,8 +18,8 @@
 #Compact phrase table and compact lexical reordering table
 #--with-cmph=/path/to/cmph
 #
-#Thread-caching malloc (optional):
-#--with-tcmalloc
+#Thread-caching malloc (if present, used for multi-threaded builds by default)
+#--without-tcmalloc
 #
 #REGRESSION TESTING
 #--with-regtest=/path/to/moses-reg-test-data
@@ -75,9 +75,9 @@ include $(TOP)/jam-files/sanity.jam ;
 boost 103600 ;
 external-lib z ;
 
-if [ option.get "with-tcmalloc" : : "yes" ] {
+if ! [ option.get "without-tcmalloc" : : "yes" ] && [ test_library "tcmalloc" ] {
   external-lib tcmalloc ;
-  requirements += <library>tcmalloc ;
+  requirements += <threading>multi:<library>tcmalloc ;
 }
 
 if [ option.get "enable-mpi" : : "yes" ] {