Force single-threaded build if --with-irstlm

2 files changed, 11 insertions, 7 deletions

diff --git a/Jamroot b/Jamroot
index 754b9400a..92b311eae 100644
--- a/Jamroot
+++ b/Jamroot
@@ -137,14 +137,20 @@ rule external_lib ( name ) {
 
 external_lib z ;
 
+requirements = ;
+
 #libSegFault prints a stack trace on segfault.  Link against it if available.  
 if [ test_flags "-lSegfault" ] {
   external_lib SegFault ;
-  segfault = <library>SegFault ;
+  requirements += <library>SegFault ;
 }
 
-trace = [ option.get "notrace" : <define>TRACE_ENABLE=1 ] ;
-boost-pool = [ option.get "enable-boost-pool" : : "<define>USE_BOOST_POOL" ] ;
+requirements += [ option.get "notrace" : <define>TRACE_ENABLE=1 ] ;
+requirements += [ option.get "enable-boost-pool" : : <define>USE_BOOST_POOL ] ;
+
+if [ option.get "with-irstlm" ] {
+  requirements += <threading>single ;
+}
 
 import os ;
 
@@ -164,9 +170,7 @@ project : requirements
   <threading>multi:<define>WITH_THREADS
   <threading>multi:<library>boost_thread
   <define>_FILE_OFFSET_BITS=64 <define>_LARGE_FILES
-  $(segfault)
-  $(trace)
-  $(boost-pool)
+  $(requirements)
   <cxxflags>$(cxxflags)
   <cflags>$(cflags)
   <linkflags>$(ldflags)
diff --git a/moses/src/LM/Jamfile b/moses/src/LM/Jamfile
index 99e7a5783..345194aa8 100644
--- a/moses/src/LM/Jamfile
+++ b/moses/src/LM/Jamfile
@@ -6,7 +6,7 @@ if $(with-irstlm) != ""
   lib irstlm : : <search>$(with-irstlm)/lib ;
   obj IRST.o : IRST.cpp ..//headers : <include>$(with-irstlm)/include ;
   alias irst : IRST.o irstlm : : : <define>LM_IRST ;
-  echo "" ;
+  echo "Forcing single-threaded build because of IRSTLM." ;
   echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" ;
   echo "!!! You are linking the IRSTLM library; be sure the release is >= 5.70.02 !!!" ;
   echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" ;