sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

EXTRAS now points to src instead of needing 'src' subdir.

Browse source 
--HG--
extra : convert_revision : 8e7e4516ace8c7852eeea3c479bfd567839a8061
This commit is contained in:
Steve Reinhardt 2008-02-11 08:04:01 -08:00
parent 476a2ee950
commit 2f7421b12b
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -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 # Parse EXTRAS option to build list of all directories where we're
# look for sources etc. This list is exported as base_dir_list. # 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']: if env['EXTRAS']:
base_dir_list += env['EXTRAS'].split(':') base_dir_list += env['EXTRAS'].split(':')

9
src/SConscript
View file

@ -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: for base_dir in base_dir_list:
src_dir = joinpath(base_dir, 'src')
if not isdir(src_dir):
continue
here = Dir('.').srcnode().abspath 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: if root == here:
# we don't want to recurse back into this SConscript # we don't want to recurse back into this SConscript
continue continue
if 'SConscript' in files: 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) SConscript(joinpath(root, 'SConscript'), build_dir=build_dir)
for opt in env.ExportOptions: for opt in env.ExportOptions: