scons: quiet the output of the sorting function so it only prints once

This commit is contained in:
Dane Springmeyer 2010-08-21 05:35:38 +00:00
parent 0eb66e8340
commit 05d37a282f

View file

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