diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-07-26 22:13:48 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-07-26 22:13:48 -0700 |
| commit | d4e69c006b1ee59c1b8bb5120252bc83d1838dc6 (patch) | |
| tree | 64dd59926f290061f5512841d35f120726b9b619 /src | |
| parent | d1e533a1e243b75b3257e2f96deb385a3b10e09b (diff) | |
| parent | 19c01e82b113db636bbac34f77a0f5f4a7525088 (diff) | |
| download | gem5-d4e69c006b1ee59c1b8bb5120252bc83d1838dc6.tar.xz | |
Merge with head.
--HG--
extra : convert_revision : e4be9d5f2ce8e3252958e2c5e03710b0bf9755c7
Diffstat (limited to 'src')
| -rw-r--r-- | src/SConscript | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/SConscript b/src/SConscript index 34c14dc51..1cd1a1627 100644 --- a/src/SConscript +++ b/src/SConscript @@ -151,7 +151,6 @@ env.Append(CPPDEFINES=[('THE_ISA','%s_ISA' % env['TARGET_ISA'].upper())]) # # Walk the tree and execute all SConscripts # -scripts = [] srcdir = env['SRCDIR'] for root, dirs, files in os.walk(srcdir, topdown=True): if root == srcdir: @@ -164,6 +163,15 @@ for root, dirs, files in os.walk(srcdir, topdown=True): base = root[len(srcdir) + 1:] SConscript(joinpath(base, 'SConscript')) +for extra in env['EXTRAS'].split(':'): + extra = os.path.expanduser(extra) + env.Append(CPPPATH=[Dir(extra)]) + for root, dirs, files in os.walk(extra, topdown=True): + if 'SConscript' in files: + subdir = root[len(os.path.dirname(extra))+1:] + build_dir = joinpath(env['BUILDDIR'], subdir) + SConscript(joinpath(root, 'SConscript'), build_dir=build_dir) + for opt in env.ExportOptions: env.ConfigFile(opt) |