summaryrefslogtreecommitdiff
path: root/src/SConscript
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@gmail.com>2007-11-16 20:10:33 -0800
committerSteve Reinhardt <stever@gmail.com>2007-11-16 20:10:33 -0800
commit785eb131907c4a3e326598643fc9b72b96911278 (patch)
tree153940765b513233bdd785fec7b96de7c62e4e8d /src/SConscript
parent21a99af0099f35a35072e3e929f42cb8caed5017 (diff)
downloadgem5-785eb131907c4a3e326598643fc9b72b96911278.tar.xz
Make EXTRAS work for relative directories.
Also print a little feedback when processing EXTRAS. --HG-- extra : convert_revision : 9cb324b0d5bc60a3c98af6495f16415b529e4af2
Diffstat (limited to 'src/SConscript')
-rw-r--r--src/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/SConscript b/src/SConscript
index e66a725d3..8e6e1b45e 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -198,12 +198,12 @@ for root, dirs, files in os.walk(srcdir, topdown=True):
extra_string = env['EXTRAS']
if extra_string and extra_string != '' and not extra_string.isspace():
for extra in extra_string.split(':'):
- extra = os.path.expanduser(extra)
- extra = os.path.normpath(extra)
+ print 'Adding', extra, 'to source directory list'
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:]
+ print ' Found SConscript in', subdir
build_dir = joinpath(env['BUILDDIR'], subdir)
SConscript(joinpath(root, 'SConscript'), build_dir=build_dir)