From ac9f2c68b63ec80e9348197345f607cd67b281ee Mon Sep 17 00:00:00 2001 From: "K. Noel Belcourt" Date: Tue, 23 Nov 2010 22:01:27 +0000 Subject: [PATCH] Set bjam timeout to maximum of -l options on command line. Patch to ensure that maximum value is selected when there's multiple -l timeout options. [SVN r66705] --- v2/engine/src/jam.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/v2/engine/src/jam.c b/v2/engine/src/jam.c index a4a150c3c..fe1146315 100644 --- a/v2/engine/src/jam.c +++ b/v2/engine/src/jam.c @@ -302,8 +302,11 @@ int main( int argc, char * * argv, char * * arg_environ ) if ( ( s = getoptval( optv, 'g', 0 ) ) ) globs.newestfirst = 1; - if ( ( s = getoptval( optv, 'l', 0 ) ) ) - globs.timeout = atoi( s ); + /* check for and use maximum value of timeout parameter */ + for ( n = 0; ( s = getoptval( optv, 'l', n ) ); ++n ) { + int t = atoi( s ); + globs.timeout = globs.timeout < t ? t : globs.timeout; + } /* Turn on/off debugging */ for ( n = 0; ( s = getoptval( optv, 'd', n ) ); ++n )