diff options
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | src/SConscript | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct index 4a0f64148..1a54bbbf6 100644 --- a/SConstruct +++ b/SConstruct @@ -285,7 +285,7 @@ global_sticky_opts.Save(global_sticky_opts_file, env) # Parse EXTRAS option to build list of all directories where we're # look for sources etc. This list is exported as base_dir_list. -base_dir_list = [ROOT] +base_dir_list = [joinpath(ROOT, 'src')] if env['EXTRAS']: base_dir_list += env['EXTRAS'].split(':') diff --git a/src/SConscript b/src/SConscript index 2ca8aa56d..69c5b946d 100644 --- a/src/SConscript +++ b/src/SConscript @@ -177,21 +177,18 @@ env.Append(CPPDEFINES=[('THE_ISA','%s_ISA' % env['TARGET_ISA'].upper())]) ######################################################################## # -# Walk the tree and execute all SConscripts in 'src' subdirectories +# Walk the tree and execute all SConscripts in subdirectories # for base_dir in base_dir_list: - src_dir = joinpath(base_dir, 'src') - if not isdir(src_dir): - continue here = Dir('.').srcnode().abspath - for root, dirs, files in os.walk(src_dir, topdown=True): + for root, dirs, files in os.walk(base_dir, topdown=True): if root == here: # we don't want to recurse back into this SConscript continue if 'SConscript' in files: - build_dir = joinpath(env['BUILDDIR'], root[len(src_dir) + 1:]) + build_dir = joinpath(env['BUILDDIR'], root[len(base_dir) + 1:]) SConscript(joinpath(root, 'SConscript'), build_dir=build_dir) for opt in env.ExportOptions: |