Force single-threaded build if --with-irstlm

This commit is contained in:
Kenneth Heafield 2011-11-30 12:17:47 +00:00
parent bec51a7d4d
commit 7d027b307f
2 changed files with 11 additions and 7 deletions

16
Jamroot
View File

@ -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)

View File

@ -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 "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" ;