From 05d37a282f9fa615d7aa50723ba79e953648df54 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sat, 21 Aug 2010 05:35:38 +0000 Subject: [PATCH] scons: quiet the output of the sorting function so it only prints once --- SConstruct | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index 5d0061159..db82c864f 100644 --- a/SConstruct +++ b/SConstruct @@ -435,12 +435,15 @@ elif preconfigured: #### Custom Configure Checks ### -def prioritize_paths(context): +def prioritize_paths(context,silent=True): env = context.env prefs = env['LINK_PRIORITY'].split(',') - context.Message( 'Sorting lib and inc compiler paths by priority... %s' % ','.join(prefs) ) + if not silent: + context.Message( 'Sorting lib and inc compiler paths by priority... %s' % ','.join(prefs) ) env['LIBPATH'] = sort_paths(env['LIBPATH'],prefs) env['CPPPATH'] = sort_paths(env['CPPPATH'],prefs) + if silent: + context.did_show_result=1 ret = context.Result( True ) return ret @@ -842,7 +845,7 @@ if not preconfigured: # if requested, sort LIBPATH and CPPPATH before running CheckLibWithHeader tests if env['PRIORITIZE_LINKING']: - conf.prioritize_paths() + conf.prioritize_paths(silent=False) for libinfo in LIBSHEADERS: if not conf.CheckLibWithHeader(libinfo[0], libinfo[1], libinfo[3]):