From 6087354bc896a13f463ba8461ed7f6315e10094b Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 3 Oct 2015 10:49:47 -0700 Subject: [PATCH] out_dir for do_sconscript is optional --- site_scons/site_init.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/site_scons/site_init.py b/site_scons/site_init.py index cfe68e7..d1412f0 100644 --- a/site_scons/site_init.py +++ b/site_scons/site_init.py @@ -2,13 +2,16 @@ # Eryn Wells -def do_sconscript(env, src_dir, out_dir): +def do_sconscript(env, src_dir, out_dir=None): ''' Look for a SConscript file in `src_dir` and run it. Return any result. ''' sconscript = src_dir.File('SConscript') print 'Reading {}'.format(sconscript) - return env.SConscript(sconscript, {'env': env}, variant_dir=out_dir) + kwargs = {} + if out_dir: + kwargs['variant_dir'] = out_dir + return env.SConscript(sconscript, {'env': env}, **kwargs) # # Argument utils